Swift 6

Author: AndrewBarba

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 /.build
 /.swiftpm
+/.index-build
 /Packages
 /*.xcodeproj
 xcuserdata/

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 import PackageDescription
 
@@ -22,16 +22,10 @@ let package = Package(
             dependencies: [
                 "ComputeRuntime",
                 .product(name: "Crypto", package: "swift-crypto"),
-            ],
-            swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency")
             ]
         ),
         .target(
-            name: "ComputeRuntime",
-            swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency")
-            ]
+            name: "ComputeRuntime"
         ),
         .executableTarget(
             name: "ComputeDemo",

Package.swift

@@ -6,11 +6,15 @@
 //
 
 @_exported import Foundation
+
 #if canImport(FoundationNetworking)
-@_exported import FoundationNetworking
+    @_exported import FoundationNetworking
 #endif
 
-public func onIncomingRequest(_ handler: @escaping (_ req: IncomingRequest, _ res: OutgoingResponse) async throws -> Void) async throws {
+@MainActor
+public func onIncomingRequest(
+    _ handler: @escaping (_ req: IncomingRequest, _ res: OutgoingResponse) async throws -> Void
+) async throws {
     // Initialize ABI
     try Fastly.ABI.initialize()
 

Sources/Compute/Compute.swift

@@ -1,11 +1,11 @@
 //
 //  OutgoingResponse.swift
-//  
+//
 //
 //  Created by Andrew Barba on 1/13/22.
 //
 
-public final class OutgoingResponse {
+public actor OutgoingResponse {
 
     internal private(set) var response: Fastly.Response
 
@@ -222,7 +222,8 @@ extension OutgoingResponse {
 extension OutgoingResponse {
 
     @discardableResult
-    public func write<T>(_ value: T, encoder: JSONEncoder = .init()) async throws -> Self where T: Encodable & Sendable {
+    public func write<T>(_ value: T, encoder: JSONEncoder = .init()) async throws -> Self
+    where T: Encodable & Sendable {
         try await sendAndStream()
         try await body.write(value, encoder: encoder)
         return self
@@ -295,7 +296,7 @@ extension OutgoingResponse {
 
 private let invalidProxyHeaders: Set<String> = [
     HTTPHeader.altSvc.rawValue,
-    HTTPHeader.transferEncoding.rawValue
+    HTTPHeader.transferEncoding.rawValue,
 ]
 
 // MARK: - CORS
@@ -313,9 +314,11 @@ extension OutgoingResponse {
     ) -> Self {
         headers[.accessControlAllowOrigin] = origin
         headers[.accessControlAllowMethods] = methods.map { $0.rawValue }.joined(separator: ", ")
-        headers[.accessControlAllowHeaders] = allowHeaders?.map { $0.stringValue }.joined(separator: ", ") ?? "*"
+        headers[.accessControlAllowHeaders] =
+            allowHeaders?.map { $0.stringValue }.joined(separator: ", ") ?? "*"
         headers[.accessControlAllowCredentials] = allowCredentials?.description
-        headers[.accessControlExposeHeaders] = exposeHeaders?.map { $0.stringValue }.joined(separator: ", ")
+        headers[.accessControlExposeHeaders] = exposeHeaders?.map { $0.stringValue }.joined(
+            separator: ", ")
         headers[.accessControlMaxAge] = String(maxAge)
         return self
     }
@@ -338,7 +341,8 @@ extension OutgoingResponse {
 
     @discardableResult
     public func upgradeToHTTP3(maxAge: Int = 86400) -> Self {
-        headers[.altSvc] = #"h3=":443";ma=\#(maxAge),h3-29=":443";ma=\#(maxAge),h3-27=":443";ma=\#(maxAge)"#
+        headers[.altSvc] =
+            #"h3=":443";ma=\#(maxAge),h3-29=":443";ma=\#(maxAge),h3-27=":443";ma=\#(maxAge)"#
         return self
     }
 }
@@ -412,8 +416,10 @@ extension OutgoingResponse {
         _ value: String,
         _ options: [CookieOption]
     ) -> Self {
-        let encodedName = name.addingPercentEncoding(withAllowedCharacters: .javascriptURLAllowed) ?? name
-        let encodedValue = value.addingPercentEncoding(withAllowedCharacters: .javascriptURLAllowed) ?? value
+        let encodedName =
+            name.addingPercentEncoding(withAllowedCharacters: .javascriptURLAllowed) ?? name
+        let encodedValue =
+            value.addingPercentEncoding(withAllowedCharacters: .javascriptURLAllowed) ?? value
         let parts = ["\(encodedName)=\(encodedValue)"] + options.map(\.value)
         let header = parts.joined(separator: "; ")
         headers.append(.setCookie, header)

Sources/Compute/OutgoingResponse.swift

@@ -1,10 +1,11 @@
 //
 //  Router.swift
-//  
+//
 //
 //  Created by Andrew Barba on 4/4/22.
 //
 
+@MainActor
 public final class Router {
 
     public typealias Handler = (IncomingRequest, OutgoingResponse) async throws -> Void
@@ -31,15 +32,18 @@ public final class Router {
 
     private func handler(for req: inout IncomingRequest) -> Handler? {
         let pathComponents = req.url.pathComponents.dropFirst()
-        return router.route(path: [req.method.rawValue] + pathComponents, parameters: &req.pathParams)
+        return router.route(
+            path: [req.method.rawValue] + pathComponents, parameters: &req.pathParams)
     }
 }
 
 extension Router {
 
     @discardableResult
     public func listen() async throws -> Self {
-        try await onIncomingRequest(self.run)
+        try await onIncomingRequest { req, res in
+            try await self.run(req, res)
+        }
         return self
     }
 }
@@ -58,7 +62,7 @@ extension Router {
     }
 
     @discardableResult
-    public func put (_ path: String, _ handler: @escaping Handler) -> Self {
+    public func put(_ path: String, _ handler: @escaping Handler) -> Self {
         return add(method: .put, path: path, handler: handler)
     }
 
@@ -109,7 +113,7 @@ extension Router {
         }
 
         // Check if response was already sent
-        guard res.didSend == false else {
+        guard await res.didSend == false else {
             return
         }
 

Sources/Compute/Router/Router.swift

@@ -17,6 +17,6 @@ try await onIncomingRequest { req, res in
     try await res.send([
         "verified": verified,
         "signature": jwt.signature.toHexString(),
-        "jwt": JWT(claims: ["a": "b"], secret: "hello-world").token
+        "jwt": JWT(claims: ["a": "b"], secret: "hello-world").token,
     ])
 }