Fix vercel encoding

Author: AndrewBarba

Plugins/VercelPackager/Server/server.js

@@ -54,9 +54,8 @@ const server = http.createServer(async (req, res) => {
     const body = await readBody(req)
     const _res = await invoke({ method, path, headers, body })
     const _body = JSON.parse(await readBody(_res))
-    const encoding = _body.isBase64Encoded ? 'base64' : 'utf8'
     res.writeHead(_body.statusCode, _body.headers)
-    res.end(Buffer.from(_body.body || '', encoding))
+    res.end(Buffer.from(_body.body || '', _body.encoding || 'utf8'))
   } catch (err) {
     console.error(err)
     res.writeHead(500, {})

Sources/Vercel/Response.swift

@@ -6,10 +6,14 @@
 //
 
 public struct Response: Codable, Sendable {
+    public enum Encoding: String, Codable, Sendable {
+        case base64
+    }
+
     public var statusCode: HTTPResponseStatus
     public var headers: HTTPHeaders?
     public var body: String?
-    public var isBase64Encoded: Bool?
+    public var encoding: Encoding?
     public var cookies: [String]?
 
     public var didSend: Bool {
@@ -20,28 +24,28 @@ public struct Response: Codable, Sendable {
         statusCode: HTTPResponseStatus = .ok,
         headers: HTTPHeaders? = nil,
         body: String? = nil,
-        isBase64Encoded: Bool? = nil,
+        encoding: Encoding? = nil,
         cookies: [String]? = nil
     ) {
         self.statusCode = statusCode
         self.headers = headers
         self.body = body
-        self.isBase64Encoded = isBase64Encoded
+        self.encoding = encoding
         self.cookies = cookies
     }
 
     public func with(
         statusCode: HTTPResponseStatus? = nil,
         headers: HTTPHeaders? = nil,
         body: String? = nil,
-        isBase64Encoded: Bool? = nil,
+        encoding: Encoding? = nil,
         cookies: [String]? = nil
     ) -> Self {
         return .init(
             statusCode: statusCode ?? self.statusCode,
             headers: headers ?? self.headers,
             body: body ?? self.body,
-            isBase64Encoded: isBase64Encoded ?? self.isBase64Encoded,
+            encoding: encoding ?? self.encoding,
             cookies: cookies ?? self.cookies
         )
     }
@@ -124,11 +128,11 @@ extension Response {
     }
 
     public func send(_ data: Data) -> Self {
-        return with(body: data.base64EncodedString(), isBase64Encoded: true)
+        return with(body: data.base64EncodedString(), encoding: .base64)
     }
 
     public func send(_ bytes: [UInt8]) -> Self {
-        return with(body: Data(bytes).base64EncodedString(), isBase64Encoded: true)
+        return with(body: Data(bytes).base64EncodedString(), encoding: .base64)
     }
 
     public func send<T>(

Sources/VercelVapor/VaporHandler.swift

@@ -105,7 +105,7 @@ extension Vercel.Response {
                 statusCode: statusCode,
                 headers: headers,
                 body: bytes?.base64String(),
-                isBase64Encoded: true
+                encoding: bytes.map { _ in .base64 }
             )
         }