@cappitolian/http-local-server-swifter 0.0.16 → 0.0.17

package/ios/Sources/HttpLocalServerSwifterPlugin/HttpLocalServerSwifter.swift

@@ -10,7 +10,6 @@ public protocol HttpLocalServerSwifterDelegate: AnyObject {
     private var webServer: HttpServer?
     private weak var delegate: HttpLocalServerSwifterDelegate?
     
-    // Store callbacks that expect a JSON String containing the full response object
     private static var pendingResponses = [String: (String) -> Void]()
     private static let queue = DispatchQueue(label: "com.cappitolian.HttpLocalServerSwifter.pendingResponses", qos: .userInitiated)
     
@@ -23,24 +22,38 @@ public protocol HttpLocalServerSwifterDelegate: AnyObject {
     }
     
     @objc public func connect(_ call: CAPPluginCall) {
-        // Run server startup in a background thread to avoid blocking the Main/UI thread
-        DispatchQueue.global(qos: .userInitiated).async {
+        // IMPORTANT: Move execution to a background thread immediately
+        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+            guard let self = self else { return }
+            
             self.disconnect()
-            self.webServer = HttpServer()
-            self.setupHandlers()
+            let server = HttpServer()
+            self.webServer = server
+            
+            // Use middleware to catch ALL requests and avoid route misses
+            server.middleware.append { [weak self] request in
+                if request.method == "OPTIONS" {
+                    return self?.corsResponse() ?? .raw(204, "No Content", nil, nil)
+                }
+                return self?.processRequest(request) ?? .raw(500, "Internal Server Error", nil, nil)
+            }
             
             do {
-                try self.webServer?.start(self.defaultPort, forceIPv4: true)
+                // We start the server. This call is non-blocking in Swifter but 
+                // it's safer to do it here.
+                try server.start(self.defaultPort, forceIPv4: true)
                 let ip = Self.getWiFiAddress() ?? "127.0.0.1"
                 
-                // Resolve the promise back to JS
+                print("🚀 SWIFTER: Server running on http://\(ip):\(self.defaultPort)")
+                
+                // Resolve back to Angular
                 call.resolve([
                     "ip": ip,
                     "port": Int(self.defaultPort)
                 ])
-                print("🚀 Server started on \(ip):\(self.defaultPort)")
             } catch {
-                call.reject("Failed to start server: \(error.localizedDescription)")
+                print("❌ SWIFTER ERROR: \(error)")
+                call.reject("Could not start server")
             }
         }
     }
@@ -51,39 +64,7 @@ public protocol HttpLocalServerSwifterDelegate: AnyObject {
         Self.queue.async { Self.pendingResponses.removeAll() }
         call?.resolve()
     }
-    
-    /**
-     * Serializes the JS response dictionary to JSON to pass it back to the processing thread
-     */
-    static func handleJsResponse(requestId: String, responseData: [String: Any]) {
-        queue.async {
-            if let callback = pendingResponses[requestId] {
-                if let jsonData = try? JSONSerialization.data(withJSONObject: responseData),
-                   let jsonString = String(data: jsonData, encoding: .utf8) {
-                    callback(jsonString)
-                }
-                pendingResponses.removeValue(forKey: requestId)
-            }
-        }
-    }
-    
-    private func setupHandlers() {
-        guard let server = webServer else { return }
-        
-        // This closure handles EVERY request regardless of the path
-        let handler: ((HttpRequest) -> HttpResponse) = { [weak self] request in
-            if request.method == "OPTIONS" { 
-                return self?.corsResponse() ?? .raw(204, "No Content", nil, nil) 
-            }
-            return self?.processRequest(request) ?? .raw(500, "Internal Server Error", nil, nil)
-        }
 
-        // Swifter needs a wildcard to catch everything including subpaths like /orders/123
-        server.middleware.append { request in
-            return handler(request)
-        }
-    }
-    
     private func processRequest(_ request: HttpRequest) -> HttpResponse {
         let requestId = UUID().uuidString
         var responseString: String?
@@ -96,7 +77,6 @@ public protocol HttpLocalServerSwifterDelegate: AnyObject {
             }
         }
         
-        // Map request to dictionary for TS
         let requestData: [String: Any] = [
             "requestId": requestId,
             "method": request.method,
@@ -106,32 +86,42 @@ public protocol HttpLocalServerSwifterDelegate: AnyObject {
             "body": String(bytes: request.body, encoding: .utf8) ?? ""
         ]
         
-        DispatchQueue.main.async { self.delegate?.httpLocalServerSwifterDidReceiveRequest(requestData) }
+        // CRITICAL: notifyListeners MUST be called from the Main Thread
+        DispatchQueue.main.async {
+            self.delegate?.httpLocalServerSwifterDidReceiveRequest(requestData)
+        }
+        
+        let result = semaphore.wait(timeout: .now() + defaultTimeout)
         
-        // Inside HttpLocalServerSwifter.swift -> processRequest
-        let result = semaphore.wait(timeout: .now() + 5.0) // Lower timeout to 5 seconds for testing
-
         if result == .timedOut {
-            print("⚠️ Request \(requestId) timed out waiting for JS")
             Self.queue.async { Self.pendingResponses.removeValue(forKey: requestId) }
             return .raw(408, "Request Timeout", nil, nil)
         }
         
-        return createDynamicResponse(responseString ?? "{\"error\":\"no_response\"}")
+        return createDynamicResponse(responseString ?? "")
     }
-    
-    /**
-     * Extracts status, headers, and body from the JSON string provided by TypeScript
-     */
-    private func createDynamicResponse(_ jsonResponse: String, statusCode defaultStatus: Int = 200) -> HttpResponse {
-        var finalStatus = defaultStatus
+
+    static func handleJsResponse(requestId: String, responseData: [String: Any]) {
+        queue.async {
+            if let callback = pendingResponses[requestId] {
+                // Extract body, status and headers to pass as a JSON string to the semaphore
+                if let jsonData = try? JSONSerialization.data(withJSONObject: responseData),
+                   let jsonString = String(data: jsonData, encoding: .utf8) {
+                    callback(jsonString)
+                }
+                pendingResponses.removeValue(forKey: requestId)
+            }
+        }
+    }
+
+    private func createDynamicResponse(_ jsonResponse: String) -> HttpResponse {
+        var finalStatus = 200
         var finalBody = jsonResponse
         var headers: [String: String] = [
             "Content-Type": "application/json",
             "Access-Control-Allow-Origin": "*",
             "Access-Control-Allow-Methods": "GET, POST, PUT, PATCH, DELETE, OPTIONS",
-            "Access-Control-Allow-Headers": "Origin, Content-Type, Accept, Authorization, X-Requested-With",
-            "Access-Control-Max-Age": "3600"
+            "Access-Control-Allow-Headers": "Origin, Content-Type, Accept, Authorization, X-Requested-With"
         ]
         
         if let data = jsonResponse.data(using: .utf8),
@@ -143,20 +133,18 @@ public protocol HttpLocalServerSwifterDelegate: AnyObject {
             }
         }
         
-        let bodyData = [UInt8](finalBody.utf8)
-        return HttpResponse.raw(finalStatus, "OK", headers) { try $0.write(bodyData) }
+        return .raw(finalStatus, "OK", headers) { try $0.write([UInt8](finalBody.utf8)) }
     }
-    
+
     private func corsResponse() -> HttpResponse {
-        return HttpResponse.raw(204, "No Content", [
+        return .raw(204, "No Content", [
             "Access-Control-Allow-Origin": "*",
             "Access-Control-Allow-Methods": "GET, POST, PUT, PATCH, DELETE, OPTIONS",
             "Access-Control-Allow-Headers": "Origin, Content-Type, Accept, Authorization, X-Requested-With",
-            "Access-Control-Max-Age": "3600"
+            "Access-Control-Max-Age": "86400"
         ], nil)
     }
 
-    // WiFi address logic remains the same...
     static func getWiFiAddress() -> String? {
         var address: String?
         var ifaddr: UnsafeMutablePointer<ifaddrs>?
@@ -164,8 +152,7 @@ public protocol HttpLocalServerSwifterDelegate: AnyObject {
             var ptr = ifaddr
             while ptr != nil {
                 let interface = ptr!.pointee
-                let addrFamily = interface.ifa_addr.pointee.sa_family
-                if addrFamily == UInt8(AF_INET) {
+                if interface.ifa_addr.pointee.sa_family == UInt8(AF_INET) {
                     let name = String(cString: interface.ifa_name)
                     if name == "en0" {
                         var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
@@ -179,4 +166,4 @@ public protocol HttpLocalServerSwifterDelegate: AnyObject {
         }
         return address
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cappitolian/http-local-server-swifter",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "Runs a local HTTP server on your device, accessible over LAN. Supports connect, disconnect, GET, and POST methods with IP and port discovery.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",