expo-http-server 0.1.14-beta.4 → 0.1.14

package/README.md

@@ -96,6 +96,18 @@ export default function App() {
 
 ```
 
+## Options
+
+`setup` accepts an optional third argument:
+
+```ts
+server.setup(9666, onStatusUpdate, { loopbackOnly: true });
+```
+
+| Option | Default | Description |
+| --- | --- | --- |
+| `loopbackOnly` | `false` | Only accept connections from the device itself (`127.0.0.1`), so other devices on the network can't reach the server. |
+
 ## Running in the background
 **iOS**: When the app is backgrounded the server will inevitably get paused. There is no getting around this. expo-http-server will start a  [background task](https://developer.apple.com/documentation/uikit/uiapplication/1623031-beginbackgroundtask) that should provide a bit more background time, but this will only be ~25 seconds, which could be lowered by Apple in the future. expo-http-server will automatically pause the server when the time runs out, and resume it when the app is resumed.
 

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

@@ -10,6 +10,7 @@ import com.safframework.server.core.http.Request
 import com.safframework.server.core.http.Response
 import org.json.JSONObject
 import java.net.BindException
+import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 
 class ExpoHttpServerModule : Module() {
@@ -60,8 +61,10 @@ class ExpoHttpServerModule : Module() {
   // rebuilding in that case only adds an unnecessary close/rebind race.
   private var hasBoundSocket = false
   private var configuredPort: Int = 0
+  private var configuredLoopbackOnly = false
   private val routeConfigs = mutableListOf<RouteConfig>()
   private val responses = ConcurrentHashMap<String, SimpleHttpResponse>()
+  private val pendingRequests = ConcurrentHashMap.newKeySet<String>()
   private val onBindFailure: (String) -> Unit = { message ->
     started = false
     hasBoundSocket = false
@@ -75,8 +78,11 @@ class ExpoHttpServerModule : Module() {
     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() }
+    val requestId = UUID.randomUUID().toString()
+    pendingRequests.add(requestId)
     sendEvent("onRequest", bundleOf(
       "uuid" to uuid,
+      "requestId" to requestId,
       "method" to request.method().name,
       "path" to request.url(),
       "body" to request.content(),
@@ -85,13 +91,14 @@ class ExpoHttpServerModule : Module() {
       "cookiesJson" to JSONObject(cookies).toString(),
     ))
     val deadline = System.currentTimeMillis() + 30_000
-    while (!responses.containsKey(uuid) && System.currentTimeMillis() < deadline) {
+    while (!responses.containsKey(requestId) && System.currentTimeMillis() < deadline) {
       Thread.sleep(10)
     }
-    val res = responses.remove(uuid) ?: return response
+    pendingRequests.remove(requestId)
+    val res = responses.remove(requestId) ?: return response
     response.setBodyText(res.body)
     response.setStatus(res.statusCode)
-    response.addHeader("Content-Length", "" + res.body.length)
+    response.addHeader("Content-Length", "" + res.body.toByteArray(Charsets.UTF_8).size)
     response.addHeader("Content-Type", res.contentType)
     for ((key, value) in res.headers) {
       response.addHeader(key, value)
@@ -99,10 +106,15 @@ class ExpoHttpServerModule : Module() {
     return response
   }
 
+  private fun buildServer(): Server = AndroidServer.Builder {
+    port { configuredPort }
+    if (configuredLoopbackOnly) {
+      address { "127.0.0.1" }
+    }
+  }.build()
+
   private fun buildServerWithRoutes(): Server {
-    var s: Server = AndroidServer.Builder {
-      port { configuredPort }
-    }.build()
+    var s: Server = buildServer()
     for (route in routeConfigs) {
       s = s.request(HttpMethod.getMethod(route.method), route.path) { request: Request, response: Response ->
         handleRequest(route.uuid, request, response)
@@ -126,15 +138,14 @@ class ExpoHttpServerModule : Module() {
       statusUpdateListeners.remove(onBindFailure)
     }
 
-    Function("setup") { port: Int ->
+    Function("setup") { port: Int, loopbackOnly: Boolean ->
       configuredPort = port
+      configuredLoopbackOnly = loopbackOnly
       server?.close()
       started = false
       hasBoundSocket = false
       routeConfigs.clear()
-      server = AndroidServer.Builder {
-        port { configuredPort }
-      }.build()
+      server = buildServer()
     }
 
     Function("route") { path: String, method: String, uuid: String ->
@@ -185,13 +196,15 @@ class ExpoHttpServerModule : Module() {
       }
     }
 
-    Function("respond") { uuid: String,
+    Function("respond") { requestId: String,
                           statusCode: Int,
                           statusDescription: String,
                           contentType: String,
                           headers: HashMap<String, String>,
                           body: String ->
-      responses[uuid] = SimpleHttpResponse(statusCode, statusDescription, contentType, headers, body);
+      if (pendingRequests.contains(requestId)) {
+        responses[requestId] = SimpleHttpResponse(statusCode, statusDescription, contentType, headers, body);
+      }
     }
 
     Function("stop") {

package/build/index.d.ts

@@ -9,6 +9,7 @@ export interface StatusEvent {
 }
 export interface RequestEvent {
     uuid: string;
+    requestId: string;
     method: string;
     path: string;
     body: string;
@@ -31,6 +32,9 @@ export interface Callback {
 }
 export declare const start: () => void;
 export declare const route: (path: string, method: HttpMethod, callback: (request: RequestEvent) => Promise<Response>) => void;
-export declare const setup: (port: number, onStatusUpdate?: ((event: StatusEvent) => void) | undefined) => void;
+export interface SetupOptions {
+    loopbackOnly?: boolean;
+}
+export declare const setup: (port: number, onStatusUpdate?: ((event: StatusEvent) => void) | undefined, options?: SetupOptions) => void;
 export declare const stop: () => void;
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;AACvE;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;AAE5E,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CACxD;AAED,eAAO,MAAM,KAAK,YA4BjB,CAAC;AAEF,eAAO,MAAM,KAAK,SACV,MAAM,UACJ,UAAU,sBACE,YAAY,KAAK,QAAQ,QAAQ,CAAC,SAUvD,CAAC;AAEF,eAAO,MAAM,KAAK,SACV,MAAM,4BACa,WAAW,KAAK,IAAI,sBAU9C,CAAC;AAEF,eAAO,MAAM,IAAI,YAIhB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;AACvE;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;AAE5E,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CACxD;AAED,eAAO,MAAM,KAAK,YAqCjB,CAAC;AAEF,eAAO,MAAM,KAAK,SACV,MAAM,UACJ,UAAU,sBACE,YAAY,KAAK,QAAQ,QAAQ,CAAC,SAUvD,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,KAAK,SACV,MAAM,4BACa,WAAW,KAAK,IAAI,yBACpC,YAAY,SAUtB,CAAC;AAEF,eAAO,MAAM,IAAI,YAIhB,CAAC"}

package/build/index.js

@@ -9,13 +9,15 @@ export const start = () => {
         try {
             const responseHandler = requestCallbacks.find((c) => c.uuid === event.uuid);
             if (!responseHandler) {
-                ExpoHttpServerModule.respond(event.uuid, 404, "Not Found", "application/json", {}, JSON.stringify({ error: "Handler not found" }));
+                ExpoHttpServerModule.respond(event.requestId, 404, "Not Found", "application/json", {}, JSON.stringify({ error: "Handler not found" }));
                 return;
             }
             const response = await responseHandler.callback(event);
-            ExpoHttpServerModule.respond(event.uuid, response.statusCode || 200, response.statusDescription || "OK", response.contentType || "application/json", response.headers || {}, response.body || "{}");
+            ExpoHttpServerModule.respond(event.requestId, response.statusCode || 200, response.statusDescription || "OK", response.contentType || "application/json", response.headers || {}, response.body ?? "{}");
+        }
+        catch {
+            ExpoHttpServerModule.respond(event.requestId, 500, "Internal Server Error", "application/json", {}, JSON.stringify({ error: "Handler failed" }));
         }
-        catch { }
     });
     ExpoHttpServerModule.start();
 };
@@ -29,7 +31,7 @@ export const route = (path, method, callback) => {
     });
     ExpoHttpServerModule.route(path, method, uuid);
 };
-export const setup = (port, onStatusUpdate) => {
+export const setup = (port, onStatusUpdate, options = {}) => {
     if (onStatusUpdate) {
         emitter.addListener("onStatusUpdate", async (event) => {
             try {
@@ -38,7 +40,7 @@ export const setup = (port, onStatusUpdate) => {
             catch { }
         });
     }
-    ExpoHttpServerModule.setup(port);
+    ExpoHttpServerModule.setup(port, options.loopbackOnly ?? false);
 };
 export const stop = () => {
     requestSubscription?.remove();

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAE1D,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,oBAAoB,CAAC,CAAC;AACvD,MAAM,gBAAgB,GAAe,EAAE,CAAC;AACxC,IAAI,mBAAmB,GAAkD,IAAI,CAAC;AAsC9E,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,EAAE;IACxB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAe,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QACnF,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5E,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,oBAAoB,CAAC,OAAO,CAC1B,KAAK,CAAC,IAAI,EACV,GAAG,EACH,WAAW,EACX,kBAAkB,EAClB,EAAE,EACF,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAC/C,CAAC;gBACF,OAAO;YACT,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACvD,oBAAoB,CAAC,OAAO,CAC1B,KAAK,CAAC,IAAI,EACV,QAAQ,CAAC,UAAU,IAAI,GAAG,EAC1B,QAAQ,CAAC,iBAAiB,IAAI,IAAI,EAClC,QAAQ,CAAC,WAAW,IAAI,kBAAkB,EAC1C,QAAQ,CAAC,OAAO,IAAI,EAAE,EACtB,QAAQ,CAAC,IAAI,IAAI,IAAI,CACtB,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC,CAAC,CAAC;IACH,oBAAoB,CAAC,KAAK,EAAE,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,IAAY,EACZ,MAAkB,EAClB,QAAsD,EACtD,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjD,gBAAgB,CAAC,IAAI,CAAC;QACpB,MAAM;QACN,IAAI;QACJ,IAAI;QACJ,QAAQ;KACT,CAAC,CAAC;IACH,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,IAAY,EACZ,cAA6C,EAC7C,EAAE;IACF,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,CAAC,WAAW,CAAc,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACjE,IAAI,CAAC;gBACH,MAAM,cAAc,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC;IACD,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,EAAE;IACvB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,mBAAmB,GAAG,IAAI,CAAC;IAC3B,oBAAoB,CAAC,IAAI,EAAE,CAAC;AAC9B,CAAC,CAAC","sourcesContent":["import { EventEmitter } from \"expo-modules-core\";\n\nimport ExpoHttpServerModule from \"./ExpoHttpServerModule\";\n\nconst emitter = new EventEmitter(ExpoHttpServerModule);\nconst requestCallbacks: Callback[] = [];\nlet requestSubscription: ReturnType<typeof emitter.addListener> | null = null;\n\nexport type HttpMethod = \"GET\" | \"POST\" | \"PUT\" | \"DELETE\" | \"OPTIONS\";\n/**\n * PAUSED AND RESUMED are iOS only\n */\nexport type Status = \"STARTED\" | \"PAUSED\" | \"RESUMED\" | \"STOPPED\" | \"ERROR\";\n\nexport interface StatusEvent {\n  status: Status;\n  message: string;\n}\n\nexport interface RequestEvent {\n  uuid: string;\n  method: string;\n  path: string;\n  body: string;\n  headersJson: string;\n  paramsJson: string;\n  cookiesJson: string;\n}\n\nexport interface Response {\n  statusCode?: number;\n  statusDescription?: string;\n  contentType?: string;\n  headers?: Record<string, string>;\n  body?: string;\n}\n\nexport interface Callback {\n  method: string;\n  path: string;\n  uuid: string;\n  callback: (request: RequestEvent) => Promise<Response>;\n}\n\nexport const start = () => {\n  requestSubscription?.remove();\n  requestSubscription = emitter.addListener<RequestEvent>(\"onRequest\", async (event) => {\n    try {\n      const responseHandler = requestCallbacks.find((c) => c.uuid === event.uuid);\n      if (!responseHandler) {\n        ExpoHttpServerModule.respond(\n          event.uuid,\n          404,\n          \"Not Found\",\n          \"application/json\",\n          {},\n          JSON.stringify({ error: \"Handler not found\" }),\n        );\n        return;\n      }\n      const response = await responseHandler.callback(event);\n      ExpoHttpServerModule.respond(\n        event.uuid,\n        response.statusCode || 200,\n        response.statusDescription || \"OK\",\n        response.contentType || \"application/json\",\n        response.headers || {},\n        response.body || \"{}\",\n      );\n    } catch {}\n  });\n  ExpoHttpServerModule.start();\n};\n\nexport const route = (\n  path: string,\n  method: HttpMethod,\n  callback: (request: RequestEvent) => Promise<Response>,\n) => {\n  const uuid = Math.random().toString(16).slice(2);\n  requestCallbacks.push({\n    method,\n    path,\n    uuid,\n    callback,\n  });\n  ExpoHttpServerModule.route(path, method, uuid);\n};\n\nexport const setup = (\n  port: number,\n  onStatusUpdate?: (event: StatusEvent) => void,\n) => {\n  if (onStatusUpdate) {\n    emitter.addListener<StatusEvent>(\"onStatusUpdate\", async (event) => {\n      try {\n        await onStatusUpdate(event);\n      } catch {}\n    });\n  }\n  ExpoHttpServerModule.setup(port);\n};\n\nexport const stop = () => {\n  requestSubscription?.remove();\n  requestSubscription = null;\n  ExpoHttpServerModule.stop();\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { EventEmitter } from \"expo-modules-core\";\n\nimport ExpoHttpServerModule from \"./ExpoHttpServerModule\";\n\nconst emitter = new EventEmitter(ExpoHttpServerModule);\nconst requestCallbacks: Callback[] = [];\nlet requestSubscription: ReturnType<typeof emitter.addListener> | null = null;\n\nexport type HttpMethod = \"GET\" | \"POST\" | \"PUT\" | \"DELETE\" | \"OPTIONS\";\n/**\n * PAUSED AND RESUMED are iOS only\n */\nexport type Status = \"STARTED\" | \"PAUSED\" | \"RESUMED\" | \"STOPPED\" | \"ERROR\";\n\nexport interface StatusEvent {\n  status: Status;\n  message: string;\n}\n\nexport interface RequestEvent {\n  uuid: string;\n  requestId: string;\n  method: string;\n  path: string;\n  body: string;\n  headersJson: string;\n  paramsJson: string;\n  cookiesJson: string;\n}\n\nexport interface Response {\n  statusCode?: number;\n  statusDescription?: string;\n  contentType?: string;\n  headers?: Record<string, string>;\n  body?: string;\n}\n\nexport interface Callback {\n  method: string;\n  path: string;\n  uuid: string;\n  callback: (request: RequestEvent) => Promise<Response>;\n}\n\nexport const start = () => {\n  requestSubscription?.remove();\n  requestSubscription = emitter.addListener<RequestEvent>(\"onRequest\", async (event) => {\n    try {\n      const responseHandler = requestCallbacks.find((c) => c.uuid === event.uuid);\n      if (!responseHandler) {\n        ExpoHttpServerModule.respond(\n          event.requestId,\n          404,\n          \"Not Found\",\n          \"application/json\",\n          {},\n          JSON.stringify({ error: \"Handler not found\" }),\n        );\n        return;\n      }\n      const response = await responseHandler.callback(event);\n      ExpoHttpServerModule.respond(\n        event.requestId,\n        response.statusCode || 200,\n        response.statusDescription || \"OK\",\n        response.contentType || \"application/json\",\n        response.headers || {},\n        response.body ?? \"{}\",\n      );\n    } catch {\n      ExpoHttpServerModule.respond(\n        event.requestId,\n        500,\n        \"Internal Server Error\",\n        \"application/json\",\n        {},\n        JSON.stringify({ error: \"Handler failed\" }),\n      );\n    }\n  });\n  ExpoHttpServerModule.start();\n};\n\nexport const route = (\n  path: string,\n  method: HttpMethod,\n  callback: (request: RequestEvent) => Promise<Response>,\n) => {\n  const uuid = Math.random().toString(16).slice(2);\n  requestCallbacks.push({\n    method,\n    path,\n    uuid,\n    callback,\n  });\n  ExpoHttpServerModule.route(path, method, uuid);\n};\n\nexport interface SetupOptions {\n  loopbackOnly?: boolean;\n}\n\nexport const setup = (\n  port: number,\n  onStatusUpdate?: (event: StatusEvent) => void,\n  options: SetupOptions = {},\n) => {\n  if (onStatusUpdate) {\n    emitter.addListener<StatusEvent>(\"onStatusUpdate\", async (event) => {\n      try {\n        await onStatusUpdate(event);\n      } catch {}\n    });\n  }\n  ExpoHttpServerModule.setup(port, options.loopbackOnly ?? false);\n};\n\nexport const stop = () => {\n  requestSubscription?.remove();\n  requestSubscription = null;\n  ExpoHttpServerModule.stop();\n};\n"]}

package/ios/ExpoHttpServerModule.swift

@@ -4,7 +4,10 @@ import Criollo
 public class ExpoHttpServerModule: Module {
     private let server = CRHTTPServer()
     private var port: Int?
+    private var loopbackOnly = false
     private var stopped = false
+    private var isListening = false
+    private var foregroundObserver: NSObjectProtocol?
     private var responses = [String: CRResponse]()
     private var bgTaskIdentifier = UIBackgroundTaskIdentifier.invalid
     
@@ -18,32 +21,54 @@ public class ExpoHttpServerModule: Module {
         Function("route", routeHandler)
         Function("respond", respondHandler)
         Function("stop", stopHandler)
+
+        OnDestroy {
+            self.shutdown()
+        }
     }
     
-    private func setupHandler(port: Int) {
+    private func setupHandler(port: Int, loopbackOnly: Bool) {
         self.port = port;
+        self.loopbackOnly = loopbackOnly;
     }
 
     private func startHandler() {
-        NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil, queue: .main) { [unowned self] notification in
-            if (!self.stopped) {
+        if (foregroundObserver == nil) {
+            foregroundObserver = NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil, queue: .main) { [weak self] _ in
+                guard let self = self, !self.stopped, !self.isListening else {
+                    return
+                }
                 self.startServer(status: "RESUMED", message: "Server resumed")
             }
         }
         stopped = false;
+        if (isListening) {
+            sendEvent("onStatusUpdate", [
+                "status": "STARTED",
+                "message": "Server started"
+            ])
+            return
+        }
         startServer(status: "STARTED", message: "Server started")
     }
     
     private func routeHandler(path: String, method: String, uuid: String) {
-        server.add(path, block: { (req, res, next) in
+        server.add(path, block: { [weak self] (req, res, next) in
             DispatchQueue.main.async {
+                guard let self = self else {
+                    return
+                }
                 var bodyString = "{}"
-                if let body = req.body, let bodyData = try? JSONSerialization.data(withJSONObject: body) {
+                if let body = req.body,
+                   JSONSerialization.isValidJSONObject(body),
+                   let bodyData = try? JSONSerialization.data(withJSONObject: body) {
                     bodyString = String(data: bodyData, encoding: .utf8) ?? "{}"
                 }
-                self.responses[uuid] = res
+                let requestId = UUID().uuidString
+                self.responses[requestId] = res
                 self.sendEvent("onRequest", [
                     "uuid": uuid,
+                    "requestId": requestId,
                     "method": req.method.toString(),
                     "path": path,
                     "body": bodyString,
@@ -51,47 +76,63 @@ public class ExpoHttpServerModule: Module {
                     "paramsJson": req.query.jsonString,
                     "cookiesJson": req.cookies?.jsonString ?? "{}"
                 ])
+                DispatchQueue.main.asyncAfter(deadline: .now() + 30) { [weak self] in
+                    self?.respondHandler(requestId: requestId,
+                                         statusCode: 504,
+                                         statusDescription: "Gateway Timeout",
+                                         contentType: "application/json",
+                                         headers: [:],
+                                         body: "{}")
+                }
             }
         }, recursive: false, method: CRHTTPMethod.fromString(method))
     }
     
-    private func respondHandler(udid: String,
+    private func respondHandler(requestId: String,
                                 statusCode: Int,
                                 statusDescription: String,
                                 contentType: String,
                                 headers: [String: String],
                                 body: String) {
         DispatchQueue.main.async {
-            if let response = self.responses[udid] {
+            if let response = self.responses[requestId] {
                 response.setStatusCode(UInt(statusCode), description: statusDescription)
                 response.setValue(contentType, forHTTPHeaderField: "Content-type")
-                response.setValue("\(body.count)", forHTTPHeaderField: "Content-Length")
+                response.setValue("\(body.utf8.count)", forHTTPHeaderField: "Content-Length")
                 for (key, value) in headers {
                     response.setValue(value, forHTTPHeaderField: key)
                 }
                 response.send(body);
-                self.responses[udid] = nil;
+                self.responses[requestId] = nil;
             }
         }
        
     }
     
     private func stopHandler() {
+        shutdown(status: "STOPPED", message: "Server stopped")
+    }
+
+    private func shutdown(status: String? = nil, message: String? = nil) {
         stopped = true;
-        stopServer(status: "STOPPED", message: "Server stopped")
+        if let observer = foregroundObserver {
+            NotificationCenter.default.removeObserver(observer)
+            foregroundObserver = nil
+        }
+        stopServer(status: status, message: message)
     }
         
     private func startServer(status: String, message: String) {
-        stopServer()
         if let port = port {
             var error: NSError?
-            server.startListening(&error, portNumber: UInt(port))
+            server.startListening(&error, portNumber: UInt(port), interface: loopbackOnly ? "localhost" : nil)
             if (error != nil) {
                 sendEvent("onStatusUpdate", [
                     "status": "ERROR",
                     "message": error?.localizedDescription ?? "Unknown error starting server"
                 ])
             } else {
+                isListening = true
                 beginBackgroundTask()
                 sendEvent("onStatusUpdate", [
                     "status": status,
@@ -108,6 +149,7 @@ public class ExpoHttpServerModule: Module {
     
     private func stopServer(status: String? = nil, message: String? = nil) {
         server.stopListening()
+        isListening = false
         endBackgroundTask()
         if let status = status, let message = message {
             sendEvent("onStatusUpdate", [
@@ -119,8 +161,8 @@ public class ExpoHttpServerModule: Module {
     
     private func beginBackgroundTask() {
         if (bgTaskIdentifier == UIBackgroundTaskIdentifier.invalid) {
-            self.bgTaskIdentifier = UIApplication.shared.beginBackgroundTask(withName: "BgTask", expirationHandler: {
-                self.stopServer(status: "PAUSED", message: "Server paused")
+            self.bgTaskIdentifier = UIApplication.shared.beginBackgroundTask(withName: "BgTask", expirationHandler: { [weak self] in
+                self?.stopServer(status: "PAUSED", message: "Server paused")
             })
         }
     }
@@ -151,6 +193,8 @@ extension CRHTTPMethod {
             return "PUT"
         case .delete:
             return "DELETE"
+        case .options:
+            return "OPTIONS"
         default:
             return "GET"
         }
@@ -165,6 +209,8 @@ extension CRHTTPMethod {
             httpMethod = .put
         case "DELETE":
             httpMethod = .delete
+        case "OPTIONS":
+            httpMethod = .options
         default:
             httpMethod = .get
         }

package/package.json

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

package/src/index.ts

@@ -19,6 +19,7 @@ export interface StatusEvent {
 
 export interface RequestEvent {
   uuid: string;
+  requestId: string;
   method: string;
   path: string;
   body: string;
@@ -49,7 +50,7 @@ export const start = () => {
       const responseHandler = requestCallbacks.find((c) => c.uuid === event.uuid);
       if (!responseHandler) {
         ExpoHttpServerModule.respond(
-          event.uuid,
+          event.requestId,
           404,
           "Not Found",
           "application/json",
@@ -60,14 +61,23 @@ export const start = () => {
       }
       const response = await responseHandler.callback(event);
       ExpoHttpServerModule.respond(
-        event.uuid,
+        event.requestId,
         response.statusCode || 200,
         response.statusDescription || "OK",
         response.contentType || "application/json",
         response.headers || {},
-        response.body || "{}",
+        response.body ?? "{}",
       );
-    } catch {}
+    } catch {
+      ExpoHttpServerModule.respond(
+        event.requestId,
+        500,
+        "Internal Server Error",
+        "application/json",
+        {},
+        JSON.stringify({ error: "Handler failed" }),
+      );
+    }
   });
   ExpoHttpServerModule.start();
 };
@@ -87,9 +97,14 @@ export const route = (
   ExpoHttpServerModule.route(path, method, uuid);
 };
 
+export interface SetupOptions {
+  loopbackOnly?: boolean;
+}
+
 export const setup = (
   port: number,
   onStatusUpdate?: (event: StatusEvent) => void,
+  options: SetupOptions = {},
 ) => {
   if (onStatusUpdate) {
     emitter.addListener<StatusEvent>("onStatusUpdate", async (event) => {
@@ -98,7 +113,7 @@ export const setup = (
       } catch {}
     });
   }
-  ExpoHttpServerModule.setup(port);
+  ExpoHttpServerModule.setup(port, options.loopbackOnly ?? false);
 };
 
 export const stop = () => {