4.0.0 gm

.github/code_of_conduct.md

@@ -0,0 +1 @@
+Vapor adopts Swift's code of conduct: https://swift.org/community/#code-of-conduct

Docs/contributing.md → .github/contributing.md

@@ -2,22 +2,13 @@
 
 👋 Welcome to the Vapor team! 
 
-## Linux
-
-You can use the included bash script to test your PR on macOS and Linux before submitting (you must have Docker installed).
-
-```sh
-Utilities/contributor_test.sh 
-```
-
 ## Testing
 
-Once in Xcode, select the `Vapor-Package` scheme and use `CMD+U` to run the tests.
+Once in Xcode, select the `vapor-Package` scheme and use `CMD+U` to run the tests.
 
-You can use the `Boilerplate...` and `Development` executables for testing out your code.
+You can use the `Development` executables for testing out your code.
 
-When adding new tests (please do 😁), don't forget to add the method name to the `allTests` array. 
-If you add a new `XCTestCase` subclass, make sure to add it to the `Tests/LinuxMain.swift` file.
+Don't forget to add tests for your new features.
 
 If you are fixing a single GitHub issue in particular, you can add a test named `testGH<issue number>` to ensure
 that your fix is working. This will also help prevent regression.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Qutheory, LLC
+Copyright (c) 2020 Qutheory, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Package.swift

@@ -15,16 +15,16 @@ let package = Package(
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.0.0"),
 
         // Sugary extensions for the SwiftNIO library
-        .package(url: "https://github.com/vapor/async-kit.git", from: "1.0.0-rc.1"),
+        .package(url: "https://github.com/vapor/async-kit.git", from: "1.0.0"),
 
         // 💻 APIs for creating interactive CLI tools.
-        .package(url: "https://github.com/vapor/console-kit.git", from: "4.0.0-rc.1"),
+        .package(url: "https://github.com/vapor/console-kit.git", from: "4.0.0"),
 
         // 🔑 Hashing (BCrypt, SHA2, HMAC), encryption (AES), public-key (RSA), and random data generation.
         .package(url: "https://github.com/apple/swift-crypto.git", from: "1.0.0"),
 
         // 🚍 High-performance trie-node router.
-        .package(url: "https://github.com/vapor/routing-kit.git", from: "4.0.0-rc.1"),
+        .package(url: "https://github.com/vapor/routing-kit.git", from: "4.0.0"),
 
         // 💥 Backtraces for Swift on Linux
         .package(url: "https://github.com/swift-server/swift-backtrace.git", from: "1.1.1"),
@@ -48,7 +48,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-metrics.git", from: "2.0.0"),
 
         // WebSocket client library built on SwiftNIO
-        .package(url: "https://github.com/vapor/websocket-kit.git", from: "2.0.0-rc.1"),
+        .package(url: "https://github.com/vapor/websocket-kit.git", from: "2.0.0"),
     ],
     targets: [
         // C helpers

README.md

@@ -81,6 +81,12 @@ Support Vapor's development by [becoming a backer](https://github.com/users/tann
     href="https://github.com/Yasumoto">
     <img src="https://avatars3.githubusercontent.com/u/48383?s=120" width="60px">
 </a>
+<a 
+    data-amt="25" 
+    data-since="3/11/20" 
+    href="https://github.com/hjuraev">
+    <img src="https://avatars3.githubusercontent.com/u/5513926?s=120" width="60px">
+</a>
 <a 
     data-amt="10" 
     data-since="10/14/19" 
@@ -99,12 +105,6 @@ Support Vapor's development by [becoming a backer](https://github.com/users/tann
     href="https://github.com/ScottRobbins">
     <img src="https://avatars3.githubusercontent.com/u/6894359?s=120" width="60px">
 </a>
-<a 
-    data-amt="10" 
-    data-since="10/15/19" 
-    href="https://github.com/ksmandersen">
-    <img src="https://avatars3.githubusercontent.com/u/178181?s=120" width="60px">
-</a>
 <a 
     data-amt="10" 
     data-since="10/15/19" 
@@ -117,6 +117,24 @@ Support Vapor's development by [becoming a backer](https://github.com/users/tann
     href="https://github.com/mikkelu">
     <img src="https://avatars3.githubusercontent.com/u/17051694?s=120" width="60px">
 </a>
+<a 
+    data-amt="10" 
+    data-since="2/28/20" 
+    href="https://github.com/timothymiko">
+    <img src="https://avatars3.githubusercontent.com/u/2555306?s=120" width="60px">
+</a>
+<a 
+    data-amt="10" 
+    data-since="2/28/20" 
+    href="https://github.com/jstevison">
+    <img src="https://avatars3.githubusercontent.com/u/149974?s=120" width="60px">
+</a>
+<a 
+    data-amt="10" 
+    data-since="4/1/20" 
+    href="https://github.com/jstorm31">
+    <img src="https://avatars3.githubusercontent.com/u/16023539?s=120" width="60px">
+</a>
 <a 
     data-amt="5" 
     data-since="10/15/19" 
@@ -159,12 +177,6 @@ Support Vapor's development by [becoming a backer](https://github.com/users/tann
     href="https://github.com/Mordil">
     <img src="https://avatars3.githubusercontent.com/u/3506776?s=120" width="60px">
 </a>
-<a 
-    data-amt="5" 
-    data-since="11/09/19" 
-    href="https://github.com/danielinoa">
-    <img src="https://avatars3.githubusercontent.com/u/972877?s=120" width="60px">
-</a>
 <a 
     data-amt="5" 
     data-since="11/14/19" 
@@ -189,6 +201,30 @@ Support Vapor's development by [becoming a backer](https://github.com/users/tann
     href="https://github.com/jordanebelanger">
     <img src="https://avatars3.githubusercontent.com/u/1856085?s=120" width="60px">
 </a>
+<a
+    data-amt="5" 
+    data-since="12/21/19" 
+    href="https://github.com/StefanCosminR">
+    <img src="https://avatars3.githubusercontent.com/u/17311242?s=120" width="60px">
+</a>
+<a
+    data-amt="5" 
+    data-since="2/1/20" 
+    href="https://github.com/piers12">
+    <img src="https://avatars3.githubusercontent.com/u/37227905?s=120" width="60px">
+</a>
+<a
+    data-amt="5" 
+    data-since="2/26/20" 
+    href="https://github.com/iq3addLi">
+    <img src="https://avatars3.githubusercontent.com/u/16850104?s=120" width="60px">
+</a>
+<a
+    data-amt="5" 
+    data-since="3/20/20" 
+    href="https://github.com/lmcd">
+    <img src="https://avatars3.githubusercontent.com/u/363540?s=120" width="60px">
+</a>
 <a
     data-amt="5" 
     data-since="04/07/20" 

Sources/Development/configure.swift

@@ -1,11 +1,11 @@
 import Vapor
 
 public func configure(_ app: Application) throws {
-    app.server.configuration.hostname = "127.0.0.1"
+    app.http.server.configuration.hostname = "127.0.0.1"
     switch app.environment {
     case .tls:
-        app.server.configuration.port = 8443
-        try app.server.configuration.tlsConfiguration = .forServer(
+        app.http.server.configuration.port = 8443
+        try app.http.server.configuration.tlsConfiguration = .forServer(
             certificateChain: [
                 .certificate(.init(
                     file: "/Users/tanner0101/dev/vapor/net-kit/certs/cert.pem",
@@ -15,7 +15,7 @@ public func configure(_ app: Application) throws {
             privateKey: .file("/Users/tanner0101/dev/vapor/net-kit/certs/key.pem")
         )
     default:
-        app.server.configuration.port = 8080
+        app.http.server.configuration.port = 8080
     }
 
     // routes

Sources/Development/routes.swift

@@ -120,17 +120,16 @@ public func routes(_ app: Application) throws {
     }
 
     let sessions = app.grouped("sessions")
-        .grouped(SessionsMiddleware(session: app.sessions.driver))
-    sessions.get("get") { req -> String in
-        return req.session.data["name"] ?? "n/a"
+        .grouped(app.sessions.middleware)
+    sessions.get("set", ":value") { req -> HTTPStatus in
+        req.session.data["name"] = req.parameters.get("value")
+        return .ok
     }
-    sessions.get("set", ":value") { req -> String in
-        let name = req.parameters.get("value")!
-        req.session.data["name"] = name
-        return name
+    sessions.get("get") { req -> String in
+        req.session.data["name"] ?? "n/a"
     }
     sessions.get("del") { req -> String in
-        req.destroySession()
+        req.session.destroy()
         return "done"
     }
 
@@ -197,7 +196,7 @@ struct TestError: AbortError {
         line: UInt = #line,
         column: UInt = #column,
         range: Range<UInt>? = nil,
-        stackTrace: StackTrace = .capture()
+        stackTrace: StackTrace? = .capture()
     ) {
         self.source = .init(
             file: file,

Sources/Vapor/Application.swift

@@ -1,7 +1,5 @@
 import Backtrace
 
-public protocol LockKey { }
-
 public final class Application {
     public var environment: Environment
     public let eventLoopGroupProvider: EventLoopGroupProvider
@@ -21,6 +19,7 @@ public final class Application {
             self.handlers.append(handler)
         }
     }
+
     public var lifecycle: Lifecycle
 
     public final class Locks {
@@ -46,7 +45,9 @@ public final class Application {
             }
         }
     }
+
     public var locks: Locks
+
     public var sync: Lock {
         self.locks.main
     }
@@ -77,11 +78,16 @@ public final class Application {
         self.isBooted = false
         self.core.initialize()
         self.views.initialize()
+        self.passwords.use(.bcrypt)
         self.sessions.initialize()
         self.sessions.use(.memory)
         self.responder.initialize()
         self.responder.use(.default)
-        self.commands.use(self.server.command, as: "serve", isDefault: true)
+        self.servers.initialize()
+        self.servers.use(.http)
+        self.clients.initialize()
+        self.clients.use(.http)
+        self.commands.use(self.servers.command, as: "serve", isDefault: true)
         self.commands.use(RoutesCommand(), as: "routes")
         // Load specific .env first since values are not overridden.
         self.loadDotEnv(named: ".env.\(self.environment.name)")
@@ -162,3 +168,5 @@ public final class Application {
         }
     }
 }
+
+public protocol LockKey { }