expo-http-server 0.1.14-beta.0 → 0.1.14-beta.2

package/android/src/main/java/expo/modules/httpserver/ExpoHttpServerModule.kt

@@ -18,10 +18,54 @@ class ExpoHttpServerModule : Module() {
                            val headers: HashMap<String, String>,
                            val body: String)
 
-  private var server: Server? = null;
-  private var started = false;
+  data class RouteConfig(val path: String, val method: String, val uuid: String)
+
+  private var server: Server? = null
+  private var started = false
+  private var configuredPort: Int = 0
+  private val routeConfigs = mutableListOf<RouteConfig>()
   private val responses = ConcurrentHashMap<String, SimpleHttpResponse>()
 
+  private fun handleRequest(uuid: String, request: Request, response: Response): Response {
+    val headers: Map<String, String> = request.headers()
+    val params: Map<String, String> = request.params()
+    val cookies: Map<String, String> = request.cookies().associate { it.name() to it.value() }
+    sendEvent("onRequest", bundleOf(
+      "uuid" to uuid,
+      "method" to request.method().name,
+      "path" to request.url(),
+      "body" to request.content(),
+      "headersJson" to JSONObject(headers).toString(),
+      "paramsJson" to JSONObject(params).toString(),
+      "cookiesJson" to JSONObject(cookies).toString(),
+    ))
+    val deadline = System.currentTimeMillis() + 30_000
+    while (!responses.containsKey(uuid) && System.currentTimeMillis() < deadline) {
+      Thread.sleep(10)
+    }
+    val res = responses.remove(uuid) ?: return response
+    response.setBodyText(res.body)
+    response.setStatus(res.statusCode)
+    response.addHeader("Content-Length", "" + res.body.length)
+    response.addHeader("Content-Type", res.contentType)
+    for ((key, value) in res.headers) {
+      response.addHeader(key, value)
+    }
+    return response
+  }
+
+  private fun buildServerWithRoutes(): Server {
+    var s: Server = AndroidServer.Builder {
+      port { configuredPort }
+    }.build()
+    for (route in routeConfigs) {
+      s = s.request(HttpMethod.getMethod(route.method), route.path) { request: Request, response: Response ->
+        handleRequest(route.uuid, request, response)
+      }
+    }
+    return s
+  }
+
   override fun definition() = ModuleDefinition {
 
     Name("ExpoHttpServer")
@@ -29,47 +73,24 @@ class ExpoHttpServerModule : Module() {
     Events("onStatusUpdate", "onRequest")
 
     Function("setup") { port: Int ->
+      configuredPort = port
       server?.close()
       started = false
-      server = AndroidServer.Builder{
-        port {
-          port
-        }
+      routeConfigs.clear()
+      server = AndroidServer.Builder {
+        port { configuredPort }
       }.build()
     }
 
     Function("route") { path: String, method: String, uuid: String ->
+      routeConfigs.add(RouteConfig(path, method, uuid))
       server = server?.request(HttpMethod.getMethod(method), path) { request: Request, response: Response ->
-        val headers: Map<String, String> = request.headers()
-        val params: Map<String, String> = request.params()
-        val cookies: Map<String, String> = request.cookies().associate { it.name() to it.value() }
-        sendEvent("onRequest", bundleOf(
-          "uuid" to uuid,
-          "method" to request.method().name,
-          "path" to request.url(),
-          "body" to request.content(),
-          "headersJson" to JSONObject(headers).toString(),
-          "paramsJson" to JSONObject(params).toString(),
-          "cookiesJson" to JSONObject(cookies).toString(),
-        ))
-        val deadline = System.currentTimeMillis() + 30_000
-        while (!responses.containsKey(uuid) && System.currentTimeMillis() < deadline) {
-          Thread.sleep(10)
-        }
-        val res = responses.remove(uuid) ?: return@request response
-        response.setBodyText(res.body)
-        response.setStatus(res.statusCode)
-        response.addHeader("Content-Length", "" + res.body.length)
-        response.addHeader("Content-Type", res.contentType)
-        for ((key, value) in res.headers) {
-          response.addHeader(key, value)
-        }
-        return@request response
-      };
+        handleRequest(uuid, request, response)
+      }
     }
 
     Function("start") {
-      if (server == null) {
+      if (configuredPort == 0) {
         sendEvent("onStatusUpdate", bundleOf(
           "status" to "ERROR",
           "message" to "Server not setup / port not configured"
@@ -78,6 +99,11 @@ class ExpoHttpServerModule : Module() {
         if (!started) {
           try {
             started = true
+            // Always close and rebuild before starting so any existing socket binding
+            // is released, preventing BindException on the Netty event loop thread
+            // (which is asynchronous and not caught by this try/catch).
+            server?.close()
+            server = buildServerWithRoutes()
             server?.start()
             sendEvent("onStatusUpdate", bundleOf(
               "status" to "STARTED",

package/ios/ExpoHttpServer.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platform       = :ios, '13.4'
+  s.platform       = :ios, '16.4'
   s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/simonsturge/expo-http-server' }
   s.static_framework = true

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "expo-http-server",
-	"version": "0.1.14-beta.0",
+	"version": "0.1.14-beta.2",
 	"description": "A simple HTTP server expo module (iOS/Android)",
 	"main": "build/index.js",
 	"types": "build/index.d.ts",