Get rid of FlyingFoxMacros

It just keeps messing up the build

Author: nevyn

Package.swift

@@ -40,7 +40,6 @@ let package = Package(
 
         .package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "137.7151.07"),
         .package(url: "https://github.com/swhitty/FlyingFox.git", .upToNextMajor(from: "0.25.0")),
-        .package(url: "https://github.com/swhitty/FlyingFoxMacros.git", .upToNextMajor(from: "0.2.0")),
 
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
         .package(url: "https://github.com/alloverse/OpenCombine.git", branch: "fix/vision-support"), // So we can use Combine on Linux.
@@ -58,7 +57,6 @@ let package = Package(
             dependencies: [
                 "PotentCodables",
                 "FlyingFox",
-                "FlyingFoxMacros",
                 "Version",
                 .product(name: "kvSIMD", package: "kvSIMD.swift"),
                 .product(name: "SIMDTools", package:"simd-tools"),

Sources/allonet2/PlaceServer/PlaceServerHTTP.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 import FlyingFox
-import FlyingFoxMacros
 
 public struct AppDescription
 {
@@ -19,7 +18,6 @@ public struct AppDescription
 }
 
 @MainActor
-@HTTPHandler
 class PlaceServerHTTP
 {
     private var http: HTTPServer! = nil
@@ -37,10 +35,11 @@ class PlaceServerHTTP
     }
     func start() async throws
     {
-        self.http = HTTPServer(port: port, handler: self)
-        // Routes are also added with @HTTPRoute/@JSONRoute, see below.
+        self.http = HTTPServer(port: port)
+        await self.http.appendRoute("GET /") { return try await self.landingPage($0) }
+        await self.http.appendRoute("POST /") { return try await self.handleIncomingClient($0) }
         try await self.status.start(on: http)
-            
+        
         try await http.start()
     }
 
@@ -49,7 +48,6 @@ class PlaceServerHTTP
         await http.stop()
     }
 
-    @HTTPRoute("GET /")
     func landingPage(_ request: HTTPRequest) async -> HTTPResponse
     {
         let host = request.headers[.host] ?? "localhost"
@@ -97,8 +95,7 @@ class PlaceServerHTTP
         )
     }
 
-    @JSONRoute("POST /")
-    func handleIncomingClient(_ request: HTTPRequest) async throws -> SignallingPayload
+    func handleIncomingClient(_ request: HTTPRequest) async throws -> HTTPResponse
     {
         let offer = try await JSONDecoder().decode(SignallingPayload.self, from: request.bodyData)
 
@@ -115,6 +112,10 @@ class PlaceServerHTTP
         let response = try await session.generateAnswer(offer: offer)
         client.logger.info("Client is \(session.clientId!), sending answer...")
 
-        return response
+        return HTTPResponse(
+            statusCode: .ok,
+            headers: [.contentType: "application/json"],
+            body: try await JSONEncoder().encode(response)
+        )
     }
 }

Sources/allonet2/PlaceServer/PlaceServerStatus.swift

@@ -7,10 +7,8 @@
 
 import Foundation
 import FlyingFox
-import FlyingFoxMacros
 
 @MainActor
-@HTTPHandler
 class PlaceServerStatus: WSMessageHandler
 {
     weak var server: PlaceServer!
@@ -24,13 +22,16 @@ class PlaceServerStatus: WSMessageHandler
 
     func start(on http: HTTPServer) async throws
     {
-        await http.appendRoute("GET /dashboard", to: self)
-        await http.appendRoute("GET /dashboard/*", to: self)
+        await http.appendRoute("GET /dashboard") {
+            return await self.index($0)
+        }
+        await http.appendRoute("GET /dashboard/logs") {
+            return await self.logs($0)
+        }
         await http.appendRoute("GET /dashboard/logs/follow", to: .webSocket(self))
     }
 
     // MARK: Status page
-    @HTTPRoute("dashboard")
     func index(_ request: HTTPRequest) async -> HTTPResponse
     {
         let body = """
@@ -328,7 +329,6 @@ class PlaceServerStatus: WSMessageHandler
     }
 
 // - MARK: Logs
-    @HTTPRoute("dashboard/logs")
     func logs(_ request: HTTPRequest) async -> HTTPResponse
     {
         let body = """