Updating to August 4, 2016

Author: noppoMan

.swift-version

@@ -1 +1 @@
-swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a
+swift-DEVELOPMENT-SNAPSHOT-2016-08-04-a

Package.swift

@@ -3,9 +3,8 @@ import PackageDescription
 let package = Package(
     name: "SessionMiddleware",
     dependencies: [
-        .Package(url: "https://github.com/Zewo/HTTP.git", majorVersion: 0, minor: 8),
-        .Package(url: "https://github.com/open-swift/S4.git", majorVersion: 0, minor: 9),
-        .Package(url: "https://github.com/noppoMan/Crypto.git", majorVersion: 0, minor: 4),
-        .Package(url: "https://github.com/noppoMan/Suv.git", majorVersion: 0, minor: 8)
+        .Package(url: "https://github.com/slimane-swift/HTTP.git", majorVersion: 0, minor: 12),
+        .Package(url: "https://github.com/noppoMan/Crypto.git", majorVersion: 0, minor: 5),
+        .Package(url: "https://github.com/noppoMan/Suv.git", majorVersion: 0, minor: 10)
     ]
 )

Sources/CookieParser.swift

@@ -24,7 +24,7 @@ func decode(_ val: String) throws -> String {
     let str = val.substring(from: val.index(val.startIndex, offsetBy: 2))
     let searchCharacter: Character = "."
     guard let index = str.lowercased().characters.index(of: searchCharacter) else {
-        throw Error.cookieParserFailure("Invalid cookie value")
+        throw SessionError.cookieParserFailure
     }
     return str.substring(to: index)
 }
@@ -54,7 +54,7 @@ func unsignSync(_ val: String, secret: String) throws -> String {
     let sha1val = try sha1.hashSync(val)
 
     if sha1mac.bytes != sha1val.bytes {
-        throw Error.cookieParserFailure("Invalid session value")
+        throw SessionError.cookieParserFailure
     }
 
     return str

Sources/Error.swift

@@ -6,19 +6,8 @@
 //  Copyright © 2016 MikeTOKYO. All rights reserved.
 //
 
-internal enum Error: ErrorProtocol, CustomStringConvertible {
-    case serializerFailure(String)
-    case cookieParserFailure(String)
+internal enum SessionError: Error {
+    case serializerFailure
+    case cookieParserFailure
     case noSessionID
-    
-    var description: String {
-        switch(self) {
-        case .serializerFailure(let message):
-            return message
-        case .cookieParserFailure(let message):
-            return message
-        case .noSessionID:
-            return "No session id"
-        }
-    }
 }

Sources/Session.swift

@@ -13,9 +13,9 @@ public struct SessionConfig {
 
     public let secret: String
 
-    public let expires: Int?
+    public let expiration: Int?
 
-    public let HTTPOnly: Bool
+    public let httpOnly: Bool
 
     public let secure: Bool
 
@@ -25,12 +25,12 @@ public struct SessionConfig {
 
     public let path: String?
 
-    public init(keyName: String = "slimane_sesid", secret: String, expires: Int? = nil, HTTPOnly: Bool = false, maxAge: Int? = nil, domain: String? = nil, path: String? = nil, secure: Bool = false, store: SessionStoreType = SessionMemoryStore()){
+    public init(keyName: String = "slimane_sesid", secret: String, expiration: Int? = nil, httpOnly: Bool = false, maxAge: Int? = nil, domain: String? = nil, path: String? = "/", secure: Bool = false, store: SessionStoreType = SessionMemoryStore()){
         self.keyName = keyName
         self.secret = secret
         self.store = store
-        self.expires = expires
-        self.HTTPOnly = HTTPOnly
+        self.expiration = expiration
+        self.httpOnly = httpOnly
         self.secure = secure
         self.maxAge = maxAge
         self.domain = domain
@@ -40,77 +40,79 @@ public struct SessionConfig {
 
 public struct Session {
 
-    private var conf: SessionConfig
+    private var config: SessionConfig
 
     public internal(set) var id: String? = nil
 
     var values = [String: String]() {
         didSet {
             if let id = self.id {
                 // Need to emit string error
-                self.conf.store.store(id, values: values, expires: ttl) { _ in }
+                self.config.store.store(id, values: values, expiration: ttl) { _ in }
             }
         }
     }
 
-    init(conf: SessionConfig){
-        self.conf = conf
+    init(config: SessionConfig){
+        self.config = config
     }
 
     public var keyName: String {
-        return self.conf.keyName
+        return self.config.keyName
     }
 
     public var secret: String {
-        return self.conf.secret
+        return self.config.secret
     }
 
-    public var HTTPOnly: Bool {
-        return self.conf.HTTPOnly
+    public var httpOnly: Bool {
+        return self.config.httpOnly
     }
 
     public var secure: Bool {
-        return self.conf.secure
+        return self.config.secure
     }
 
     public var maxAge: Int? {
-        return self.conf.maxAge
+        return self.config.maxAge
     }
 
     public var domain: String? {
-        return self.conf.domain
+        return self.config.domain
     }
 
     public var path: String? {
-        return self.conf.path
+        return self.config.path
     }
 
-    public var expires: Time? {
+    public var expiration: Time? {
         if let ttl = self.ttl {
             return Time(tz: .Local).addSec(ttl)
         }
         return nil
     }
 
     public var ttl: Int? {
-        return self.conf.expires
+        return self.config.expiration
     }
 
     public var hashValue: Int {
-        return self.conf.keyName.hashValue
+        return self.config.keyName.hashValue
     }
 
-    public func load(_ completion: (SessionResult<[String: String]>) -> Void){
+    public func load(_ completion: @escaping ((Void) throws -> [String: String]) -> Void){
         if let id = self.id {
-            self.conf.store.load(id, completion: completion)
+            self.config.store.load(id, completion: completion)
         } else {
-            completion(.error(Error.noSessionID))
+            completion {
+                throw SessionError.noSessionID
+            }
         }
     }
 
     public func destroy(){
         if let id = self.id {
-            self.conf.store.destroy(id)
+            self.config.store.destroy(id)
         }
     }
 
@@ -121,15 +123,9 @@ public struct Session {
 
 extension Session: Sequence {
 
-    #if swift(>=3.0)
     public func makeIterator() -> DictionaryIterator<String, String> {
         return values.makeIterator()
     }
-    #else
-    public func generate() -> DictionaryGenerator<String, String> {
-        return values.generate()
-    }
-    #endif
 
     public var count: Int {
         return values.count
@@ -152,4 +148,4 @@ extension Session: Sequence {
             self.values[key] = newValue
         }
     }
-}
+}

Sources/SessionMemoryStore.swift

@@ -12,14 +12,14 @@ public struct SessionMemoryStore: SessionStoreType {
 
     public init(){}
 
-    public func load(_ sessionId: String, completion: (SessionResult<[String: String]>) -> Void) {
+    public func load(_ sessionId: String, completion: @escaping ((Void) throws -> [String: String]) -> Void) {
         guard let sesValues = sessionMap[sessionId] else {
-            return completion(.data([:]))
+            return completion { [:] }
         }
-        completion(.data(sesValues))
+        completion { sesValues }
     }
 
-    public func store(_ key: String, values: [String: String], expires: Int?, completion: () -> Void) {
+    public func store(_ key: String, values: [String: String], expiration: Int?, completion: @escaping () -> Void) {
         sessionMap[key] = values
         completion()
     }

Sources/SessionMiddleware.swift

@@ -34,28 +34,28 @@ extension Request {
 public struct SessionMiddleware: AsyncMiddleware {
     var session: Session
 
-    public init(conf: SessionConfig){
-        session = Session(conf: conf)
+    public init(config: SessionConfig){
+        session = Session(config: config)
     }
 
-    public func respond(to request: Request, chainingTo next: AsyncResponder, result: ((Void) throws -> Response) -> Void) {
+    public func respond(to request: Request, chainingTo next: AsyncResponder, result: @escaping ((Void) throws -> Response) -> Void) {
         var req = request
         req.storage[makeKey("session")] = session
 
-        var err: ErrorProtocol? = nil
-        var setCookie: S4.Cookies? = nil
+        var err: Error? = nil
+        var setCookie: Set<AttributedCookie>? = nil
 
         let onThread = {
             // Parse signedCookies
-            if let cookieString = req.headers["cookie"], cookies = HTTP.Cookie.parse(string: cookieString) {
+            if let cookieString = req.headers["cookie"], let cookies = Set<Cookie>(cookieHeader: cookieString) {
                 req.storage["signedCookies"] = signedCookies(cookies, secret: self.session.secret)
             }
 
             if self.shouldSetCookie(req) {
                 do {
-                    let cookie = try self.initCookieForSet()
-                    setCookie = S4.Cookies(cookies: [cookie])
-                    req.session?.id = signedCookies(Set([HTTP.Cookie(name: cookie.name, value: cookie.value)]), secret: self.session.secret)[self.session.keyName]
+                    let cookie = try self.createCookieForSet()
+                    setCookie = Set<AttributedCookie>([cookie])
+                    req.session?.id = signedCookies(Set([Cookie(name: cookie.name, value: cookie.value)]), secret: self.session.secret)[self.session.keyName]
                 } catch {
                     err = error
                 }
@@ -88,27 +88,27 @@ public struct SessionMiddleware: AsyncMiddleware {
 
             req.session?.id = sessionId
 
-            req.session?.load() {
+            req.session?.load() { getData in
                 req.session?.values = [:]
-
-                if case .error(let error) = $0 {
-                    result {
+                
+                do {
+                    let data = try getData()
+                    req.session?.values = data
+                } catch {
+                    return result {
                         throw error
                     }
                 }
-                else if case .data(let sesValue) = $0 {
-                    req.session?.values = sesValue
-                }
+                
                 next.respond(to: req, result: result)
             }
         }
 
         Process.qwork(onThread: onThread, onFinish: onFinish)
     }
 
-
     private func shouldSetCookie(_ req: Request) -> Bool {
-        guard let cookieValue = req.cookies.filter({ (k,_) in k.trim() == session.keyName }).map({ (_,v) in v}).first else {
+        guard let cookieValue = req.cookies.filter({ $0.name.trim() == session.keyName }).map({ $0.value }).first else {
             return true
         }
 
@@ -121,8 +121,16 @@ public struct SessionMiddleware: AsyncMiddleware {
         }
     }
 
-    private func initCookieForSet() throws -> S4.Cookie {
+    private func createCookieForSet() throws -> AttributedCookie {
         let sessionId = try signSync(Session.generateId().hexadecimalString(), secret: session.secret)
-        return S4.Cookie(name: session.keyName, value: sessionId, expires: session.expires?.rfc822, maxAge: session.maxAge, domain: session.domain, path: session.path, secure: session.secure, HTTPOnly: session.HTTPOnly)
+        
+        var maxAge: AttributedCookie.Expiration?
+        if let ttl = session.ttl {
+            maxAge = .maxAge(ttl)
+        } else {
+            maxAge = nil
+        }
+        
+        return AttributedCookie(name: session.keyName, value: sessionId, expiration: maxAge , domain: session.domain, path: session.path, secure: session.secure, httpOnly: session.httpOnly)
     }
 }

Sources/SessionStoreType.swift

@@ -6,13 +6,8 @@
 //  Copyright © 2016 MikeTOKYO. All rights reserved.
 //
 
-public enum SessionResult<T> {
-    case data(T)
-    case error(ErrorProtocol)
-}
-
 public protocol SessionStoreType {
     func destroy(_ sessionId: String)
-    func load(_ sessionId: String, completion: (SessionResult<[String: String]>) -> Void)
-    func store(_ sessionId: String, values: [String: String], expires: Int?, completion: () -> Void)
+    func load(_ sessionId: String, completion: @escaping ((Void) throws -> [String: String]) -> Void)
+    func store(_ sessionId: String, values: [String: String], expiration: Int?, completion: @escaping () -> Void)
 }