Change argument of app::enable_rest to REST port

SanderMertens · May 12, 2023 · 3ca10b6 · 3ca10b6
1 parent efa2613
commit 3ca10b6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/flecs.c b/flecs.c
@@ -44586,7 +44586,7 @@ int ecs_app_run(
 #ifdef ECS_TARGET_EM
  flecs_wasm_rest_server = ecs_rest_server_init(world, NULL);
 #else
- ecs_set(world, EcsWorld, EcsRest, {.port = 0});
+ ecs_set(world, EcsWorld, EcsRest, {.port = desc->port });
 #endif
 #else
  ecs_warn("cannot enable remote API, REST addon not available");

diff --git a/flecs.h b/flecs.h
@@ -9630,8 +9630,9 @@ typedef struct ecs_app_desc_t {
  ecs_ftime_t delta_time; /**< Frame time increment (0 for measured values) */
  int32_t threads; /**< Number of threads. */
  int32_t frames; /**< Number of frames to run (0 for infinite) */
- bool enable_rest; /**< Allows HTTP clients to access ECS data */
+ bool enable_rest; /**< Enables ECS access over HTTP, necessary for explorer */
  bool enable_monitor; /**< Periodically collect statistics */
+ uint16_t port; /**< HTTP port used by REST API */
 
  ecs_app_init_action_t init; /**< If set, function is ran before starting the
  * main loop. */
@@ -17477,8 +17478,9 @@ struct app_builder {
  return *this;
  }
 
- app_builder& enable_rest(bool value = true) {
- m_desc.enable_rest = value;
+ app_builder& enable_rest(uint16_t port = 0) {
+ m_desc.enable_rest = true;
+ m_desc.port = port;
  return *this;
  }
 

diff --git a/include/flecs/addons/app.h b/include/flecs/addons/app.h
@@ -39,8 +39,9 @@ typedef struct ecs_app_desc_t {
  ecs_ftime_t delta_time; /**< Frame time increment (0 for measured values) */
  int32_t threads; /**< Number of threads. */
  int32_t frames; /**< Number of frames to run (0 for infinite) */
- bool enable_rest; /**< Allows HTTP clients to access ECS data */
+ bool enable_rest; /**< Enables ECS access over HTTP, necessary for explorer */
  bool enable_monitor; /**< Periodically collect statistics */
+ uint16_t port; /**< HTTP port used by REST API */
 
  ecs_app_init_action_t init; /**< If set, function is ran before starting the
  * main loop. */

diff --git a/include/flecs/addons/cpp/mixins/app/builder.hpp b/include/flecs/addons/cpp/mixins/app/builder.hpp
@@ -47,8 +47,9 @@ struct app_builder {
  return *this;
  }
 
- app_builder& enable_rest(bool value = true) {
- m_desc.enable_rest = value;
+ app_builder& enable_rest(uint16_t port = 0) {
+ m_desc.enable_rest = true;
+ m_desc.port = port;
  return *this;
  }
 

diff --git a/src/addons/app.c b/src/addons/app.c
@@ -96,7 +96,7 @@ int ecs_app_run(
 #ifdef ECS_TARGET_EM
  flecs_wasm_rest_server = ecs_rest_server_init(world, NULL);
 #else
- ecs_set(world, EcsWorld, EcsRest, {.port = 0});
+ ecs_set(world, EcsWorld, EcsRest, {.port = desc->port });
 #endif
 #else
  ecs_warn("cannot enable remote API, REST addon not available");