expo-http-server 0.1.9 → 0.1.10

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

@@ -21,31 +21,6 @@ class ExpoHttpServerModule : Module() {
   private var started = false;
   private val responses = HashMap<String, SimpleHttpResponse>()
 
-  private val requestHandler: RequestHandler = { request: Request, response: Response ->
-    val uuid = UUID.randomUUID().toString()
-    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(),
-    ))
-    while (!responses.containsKey(uuid)) {
-      Thread.sleep(10)
-    }
-    val res = responses[uuid]!!
-    responses.remove(uuid);
-    response.setBodyText(res.body)
-    response.setStatus(res.statusCode)
-    response.addHeader("Content-Length", "" + res.body.length)
-    response.addHeader("Content-Type", res.contentType)
-  }
-
   override fun definition() = ModuleDefinition {
 
     Name("ExpoHttpServer")
@@ -60,8 +35,30 @@ class ExpoHttpServerModule : Module() {
       }.build()
     }
 
-    Function("route") { path: String, method: String ->
-      server = server?.request(HttpMethod.getMethod(method), path, requestHandler);
+    Function("route") { path: String, method: String, uuid: String ->
+      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(),
+        ))
+        while (!responses.containsKey(uuid)) {
+          Thread.sleep(10)
+        }
+        val res = responses[uuid]!!
+        responses.remove(uuid);
+        response.setBodyText(res.body)
+        response.setStatus(res.statusCode)
+        response.addHeader("Content-Length", "" + res.body.length)
+        response.addHeader("Content-Type", res.contentType)
+      };
     }
 
     Function("start") {

package/build/index.d.ts

@@ -24,6 +24,7 @@ export interface Response {
 export interface Callback {
     method: string;
     path: string;
+    uuid: string;
     callback: (request: RequestEvent) => Promise<Response>;
 }
 export declare const start: () => void;

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;AAC3D;;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,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CACxD;AAED,eAAO,MAAM,KAAK,YAyBjB,CAAC;AAEF,eAAO,MAAM,KAAK,SACV,MAAM,UACJ,UAAU,sBACE,YAAY,KAAK,QAAQ,QAAQ,CAAC,SAQvD,CAAC;AAEF,eAAO,MAAM,KAAK,SACV,MAAM,4BACa,WAAW,KAAK,IAAI,sBAQ9C,CAAC;AAEF,eAAO,MAAM,IAAI,WAAoC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;AAC3D;;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,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,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,YAqBjB,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,sBAQ9C,CAAC;AAEF,eAAO,MAAM,IAAI,WAAoC,CAAC"}

package/build/index.js

@@ -4,25 +4,25 @@ const emitter = new EventEmitter(ExpoHttpServerModule);
 const requestCallbacks = [];
 export const start = () => {
     emitter.addListener("onRequest", async (event) => {
-        const callbacks = requestCallbacks.filter((c) => event.path.includes(c.path) && event.method === c.method);
-        if (!callbacks.length) {
-            ExpoHttpServerModule.respond(event.uuid, 200, "No callback", "No callback");
+        const responseHandler = requestCallbacks.find((c) => c.uuid === event.uuid);
+        if (!responseHandler) {
+            ExpoHttpServerModule.respond(event.uuid, 404, "application/json", JSON.stringify({ error: "Handler not found" }));
             return;
         }
-        for (const c of callbacks) {
-            const response = await c.callback(event);
-            ExpoHttpServerModule.respond(event.uuid, response.statusCode || 200, response.contentType || "application/json", response.body || "{}");
-        }
+        const response = await responseHandler.callback(event);
+        ExpoHttpServerModule.respond(event.uuid, response.statusCode || 200, response.contentType || "application/json", response.body || "{}");
     });
     ExpoHttpServerModule.start();
 };
 export const route = (path, method, callback) => {
+    const uuid = Math.random().toString(16).slice(2);
     requestCallbacks.push({
         method,
         path,
+        uuid,
         callback,
     });
-    ExpoHttpServerModule.route(path, method);
+    ExpoHttpServerModule.route(path, method, uuid);
 };
 export const setup = (port, onStatusUpdate) => {
     if (onStatusUpdate) {

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;AAmCxC,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,EAAE;IACxB,OAAO,CAAC,WAAW,CAAe,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAC7D,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CACvC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAChE,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACtB,oBAAoB,CAAC,OAAO,CAC1B,KAAK,CAAC,IAAI,EACV,GAAG,EACH,aAAa,EACb,aAAa,CACd,CAAC;YACF,OAAO;QACT,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzC,oBAAoB,CAAC,OAAO,CAC1B,KAAK,CAAC,IAAI,EACV,QAAQ,CAAC,UAAU,IAAI,GAAG,EAC1B,QAAQ,CAAC,WAAW,IAAI,kBAAkB,EAC1C,QAAQ,CAAC,IAAI,IAAI,IAAI,CACtB,CAAC;QACJ,CAAC;IACH,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,gBAAgB,CAAC,IAAI,CAAC;QACpB,MAAM;QACN,IAAI;QACJ,QAAQ;KACT,CAAC,CAAC;IACH,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC3C,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,cAAc,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;IACD,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC","sourcesContent":["import { EventEmitter } from \"expo-modules-core\";\n\nimport ExpoHttpServerModule from \"./ExpoHttpServerModule\";\n\nconst emitter = new EventEmitter(ExpoHttpServerModule);\nconst requestCallbacks: Callback[] = [];\n\nexport type HttpMethod = \"GET\" | \"POST\" | \"PUT\" | \"DELETE\";\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  contentType?: string;\n  body?: string;\n}\n\nexport interface Callback {\n  method: string;\n  path: string;\n  callback: (request: RequestEvent) => Promise<Response>;\n}\n\nexport const start = () => {\n  emitter.addListener<RequestEvent>(\"onRequest\", async (event) => {\n    const callbacks = requestCallbacks.filter(\n      (c) => event.path.includes(c.path) && event.method === c.method,\n    );\n    if (!callbacks.length) {\n      ExpoHttpServerModule.respond(\n        event.uuid,\n        200,\n        \"No callback\",\n        \"No callback\",\n      );\n      return;\n    }\n    for (const c of callbacks) {\n      const response = await c.callback(event);\n      ExpoHttpServerModule.respond(\n        event.uuid,\n        response.statusCode || 200,\n        response.contentType || \"application/json\",\n        response.body || \"{}\",\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  requestCallbacks.push({\n    method,\n    path,\n    callback,\n  });\n  ExpoHttpServerModule.route(path, method);\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      onStatusUpdate(event);\n    });\n  }\n  ExpoHttpServerModule.setup(port);\n};\n\nexport const stop = () => ExpoHttpServerModule.stop();\n"]}
+{"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;AAoCxC,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,EAAE;IACxB,OAAO,CAAC,WAAW,CAAe,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAC7D,MAAM,eAAe,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,oBAAoB,CAAC,OAAO,CAC1B,KAAK,CAAC,IAAI,EACV,GAAG,EACH,kBAAkB,EAClB,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAC/C,CAAC;YACF,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvD,oBAAoB,CAAC,OAAO,CAC1B,KAAK,CAAC,IAAI,EACV,QAAQ,CAAC,UAAU,IAAI,GAAG,EAC1B,QAAQ,CAAC,WAAW,IAAI,kBAAkB,EAC1C,QAAQ,CAAC,IAAI,IAAI,IAAI,CACtB,CAAC;IACJ,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,cAAc,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;IACD,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC","sourcesContent":["import { EventEmitter } from \"expo-modules-core\";\n\nimport ExpoHttpServerModule from \"./ExpoHttpServerModule\";\n\nconst emitter = new EventEmitter(ExpoHttpServerModule);\nconst requestCallbacks: Callback[] = [];\n\nexport type HttpMethod = \"GET\" | \"POST\" | \"PUT\" | \"DELETE\";\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  contentType?: 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  emitter.addListener<RequestEvent>(\"onRequest\", async (event) => {\n    const responseHandler = requestCallbacks.find((c) => c.uuid === event.uuid);\n    if (!responseHandler) {\n      ExpoHttpServerModule.respond(\n        event.uuid,\n        404,\n        \"application/json\",\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.contentType || \"application/json\",\n      response.body || \"{}\",\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 const setup = (\n  port: number,\n  onStatusUpdate?: (event: StatusEvent) => void,\n) => {\n  if (onStatusUpdate) {\n    emitter.addListener<StatusEvent>(\"onStatusUpdate\", async (event) => {\n      onStatusUpdate(event);\n    });\n  }\n  ExpoHttpServerModule.setup(port);\n};\n\nexport const stop = () => ExpoHttpServerModule.stop();\n"]}

package/ios/ExpoHttpServerModule.swift

@@ -34,10 +34,9 @@ public class ExpoHttpServerModule: Module {
         startServer(status: "STARTED", message: "Server started")
     }
     
-    private func routeHandler(path: String, method: String) {
+    private func routeHandler(path: String, method: String, uuid: String) {
         server.add(path, block: { (req, res, next) in
             DispatchQueue.main.async {
-                let uuid = UUID().uuidString
                 var bodyString = "{}"
                 if let body = req.body, let bodyData = try? JSONSerialization.data(withJSONObject: body) {
                     bodyString = String(data: bodyData, encoding: .utf8) ?? "{}"
@@ -53,7 +52,7 @@ public class ExpoHttpServerModule: Module {
                     "cookiesJson": req.cookies?.jsonString ?? "{}"
                 ])
             }
-        }, recursive: true, method: CRHTTPMethod.fromString(method))
+        }, recursive: false, method: CRHTTPMethod.fromString(method))
     }
     
     private func respondHandler(udid: String,

package/package.json

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

package/src/index.ts

@@ -35,32 +35,29 @@ export interface Response {
 export interface Callback {
   method: string;
   path: string;
+  uuid: string;
   callback: (request: RequestEvent) => Promise<Response>;
 }
 
 export const start = () => {
   emitter.addListener<RequestEvent>("onRequest", async (event) => {
-    const callbacks = requestCallbacks.filter(
-      (c) => event.path.includes(c.path) && event.method === c.method,
-    );
-    if (!callbacks.length) {
+    const responseHandler = requestCallbacks.find((c) => c.uuid === event.uuid);
+    if (!responseHandler) {
       ExpoHttpServerModule.respond(
         event.uuid,
-        200,
-        "No callback",
-        "No callback",
+        404,
+        "application/json",
+        JSON.stringify({ error: "Handler not found" }),
       );
       return;
     }
-    for (const c of callbacks) {
-      const response = await c.callback(event);
-      ExpoHttpServerModule.respond(
-        event.uuid,
-        response.statusCode || 200,
-        response.contentType || "application/json",
-        response.body || "{}",
-      );
-    }
+    const response = await responseHandler.callback(event);
+    ExpoHttpServerModule.respond(
+      event.uuid,
+      response.statusCode || 200,
+      response.contentType || "application/json",
+      response.body || "{}",
+    );
   });
   ExpoHttpServerModule.start();
 };
@@ -70,12 +67,14 @@ export const route = (
   method: HttpMethod,
   callback: (request: RequestEvent) => Promise<Response>,
 ) => {
+  const uuid = Math.random().toString(16).slice(2);
   requestCallbacks.push({
     method,
     path,
+    uuid,
     callback,
   });
-  ExpoHttpServerModule.route(path, method);
+  ExpoHttpServerModule.route(path, method, uuid);
 };
 
 export const setup = (