const paths for registry and support for const variables (#1855)

stephenberry · web-flow · commit 01cbe2020b70 · 2025-07-14T10:39:40.000-05:00
* const paths for registry

* Handle const variables
diff --git a/include/glaze/net/rest_registry_impl.hpp b/include/glaze/net/rest_registry_impl.hpp
@@ -39,7 +39,7 @@ namespace glz
       }
 
       template <class T, class RegistryType>
-      static void register_endpoint(sv path, T& value, RegistryType& reg)
+      static void register_endpoint(const sv path, T& value, RegistryType& reg)
       {
          std::string rest_path = convert_to_rest_path(path);
 
@@ -61,7 +61,7 @@ namespace glz
       }
 
       template <class Func, class Result, class RegistryType>
-      static void register_function_endpoint(sv path, Func& func, RegistryType& reg)
+      static void register_function_endpoint(const sv path, Func& func, RegistryType& reg)
       {
          std::string rest_path = convert_to_rest_path(path);
 
@@ -79,7 +79,7 @@ namespace glz
       }
 
       template <class Func, class Params, class RegistryType>
-      static void register_param_function_endpoint(sv path, Func& func, RegistryType& reg)
+      static void register_param_function_endpoint(const sv path, Func& func, RegistryType& reg)
       {
          std::string rest_path = convert_to_rest_path(path);
 
@@ -107,7 +107,7 @@ namespace glz
       }
 
       template <class Obj, class RegistryType>
-      static void register_object_endpoint(sv path, Obj& obj, RegistryType& reg)
+      static void register_object_endpoint(const sv path, Obj& obj, RegistryType& reg)
       {
          std::string rest_path = convert_to_rest_path(path);
 
@@ -128,7 +128,7 @@ namespace glz
       }
 
       template <class Value, class RegistryType>
-      static void register_value_endpoint(sv path, Value& value, RegistryType& reg)
+      static void register_value_endpoint(const sv path, Value& value, RegistryType& reg)
       {
          std::string rest_path = convert_to_rest_path(path);
 
@@ -150,7 +150,7 @@ namespace glz
       }
 
       template <class Var, class RegistryType>
-      static void register_variable_endpoint(sv path, Var& var, RegistryType& reg)
+      static void register_variable_endpoint(const sv path, Var& var, RegistryType& reg)
       {
          std::string rest_path = convert_to_rest_path(path);
 
@@ -171,7 +171,7 @@ namespace glz
       }
 
       template <class T, class F, class Ret, class RegistryType>
-      static void register_member_function_endpoint(sv path, T& value, F func, RegistryType& reg)
+      static void register_member_function_endpoint(const sv path, T& value, F func, RegistryType& reg)
       {
          std::string rest_path = convert_to_rest_path(path);
 
@@ -189,7 +189,7 @@ namespace glz
       }
 
       template <class T, class F, class Input, class Ret, class RegistryType>
-      static void register_member_function_with_params_endpoint(sv path, T& value, F func, RegistryType& reg)
+      static void register_member_function_with_params_endpoint(const sv path, T& value, F func, RegistryType& reg)
       {
          std::string rest_path = convert_to_rest_path(path);
 
diff --git a/include/glaze/rpc/registry.hpp b/include/glaze/rpc/registry.hpp
@@ -143,7 +143,8 @@ namespace glz
                }
                else {
                   // this is a variable and not a function, so we build RPC read/write calls
-                  impl::template register_variable_endpoint<std::remove_cvref_t<Func>>(full_key, func, *this);
+                  // We can't remove const here, because const fields need to be able to be written
+                  impl::template register_variable_endpoint<std::remove_reference_t<Func>>(full_key, func, *this);
                }
             }
          });
diff --git a/include/glaze/rpc/repe/repe_registry_impl.hpp b/include/glaze/rpc/repe/repe_registry_impl.hpp
@@ -23,7 +23,7 @@ namespace glz
    struct registry_impl<Opts, REPE>
    {
       template <class T, class RegistryType>
-      static void register_endpoint(sv path, T& value, RegistryType& reg)
+      static void register_endpoint(const sv path, T& value, RegistryType& reg)
       {
          reg.endpoints[path] = [&value](repe::state&& state) mutable {
             if (state.write()) {
@@ -46,7 +46,7 @@ namespace glz
       }
 
       template <class Func, class Result, class RegistryType>
-      static void register_function_endpoint(sv path, Func& func, RegistryType& reg)
+      static void register_function_endpoint(const sv path, Func& func, RegistryType& reg)
       {
          if constexpr (std::same_as<Result, void>) {
             reg.endpoints[path] = [&func](repe::state&& state) mutable {
@@ -71,7 +71,7 @@ namespace glz
       }
 
       template <class Func, class Params, class RegistryType>
-      static void register_param_function_endpoint(sv path, Func& func, RegistryType& reg)
+      static void register_param_function_endpoint(const sv path, Func& func, RegistryType& reg)
       {
          reg.endpoints[path] = [&func](repe::state&& state) mutable {
             static thread_local std::decay_t<Params> params{};
@@ -103,7 +103,7 @@ namespace glz
       }
 
       template <class Obj, class RegistryType>
-      static void register_object_endpoint(sv path, Obj& obj, RegistryType& reg)
+      static void register_object_endpoint(const sv path, Obj& obj, RegistryType& reg)
       {
          reg.endpoints[path] = [&obj](repe::state&& state) mutable {
             if (state.write()) {
@@ -126,7 +126,7 @@ namespace glz
       }
 
       template <class Value, class RegistryType>
-      static void register_value_endpoint(sv path, Value& value, RegistryType& reg)
+      static void register_value_endpoint(const sv path, Value& value, RegistryType& reg)
       {
          reg.endpoints[path] = [value](repe::state&& state) mutable {
             if (state.write()) {
@@ -150,7 +150,7 @@ namespace glz
       }
 
       template <class Var, class RegistryType>
-      static void register_variable_endpoint(sv path, Var& var, RegistryType& reg)
+      static void register_variable_endpoint(const sv path, Var& var, RegistryType& reg)
       {
          reg.endpoints[path] = [&var](repe::state&& state) mutable {
             if (state.write()) {
@@ -174,7 +174,7 @@ namespace glz
       }
 
       template <class T, class F, class Ret, class RegistryType>
-      static void register_member_function_endpoint(sv path, T& value, F func, RegistryType& reg)
+      static void register_member_function_endpoint(const sv path, T& value, F func, RegistryType& reg)
       {
          reg.endpoints[path] = [&value, func](repe::state&& state) mutable {
             if constexpr (std::same_as<Ret, void>) {
@@ -200,7 +200,7 @@ namespace glz
       }
 
       template <class T, class F, class Input, class Ret, class RegistryType>
-      static void register_member_function_with_params_endpoint(sv path, T& value, F func, RegistryType& reg)
+      static void register_member_function_with_params_endpoint(const sv path, T& value, F func, RegistryType& reg)
       {
          reg.endpoints[path] = [&value, func](repe::state&& state) mutable {
             static thread_local Input input{};

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ namespace glz`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`template <class T, class RegistryType>`
`42`		`- static void register_endpoint(sv path, T& value, RegistryType& reg)`
	`42`	`+ static void register_endpoint(const sv path, T& value, RegistryType& reg)`
`43`	`43`	`{`
`44`	`44`	`std::string rest_path = convert_to_rest_path(path);`
`45`	`45`
`@@ -61,7 +61,7 @@ namespace glz`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`template <class Func, class Result, class RegistryType>`
`64`		`- static void register_function_endpoint(sv path, Func& func, RegistryType& reg)`
	`64`	`+ static void register_function_endpoint(const sv path, Func& func, RegistryType& reg)`
`65`	`65`	`{`
`66`	`66`	`std::string rest_path = convert_to_rest_path(path);`
`67`	`67`
`@@ -79,7 +79,7 @@ namespace glz`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`template <class Func, class Params, class RegistryType>`
`82`		`- static void register_param_function_endpoint(sv path, Func& func, RegistryType& reg)`
	`82`	`+ static void register_param_function_endpoint(const sv path, Func& func, RegistryType& reg)`
`83`	`83`	`{`
`84`	`84`	`std::string rest_path = convert_to_rest_path(path);`
`85`	`85`
`@@ -107,7 +107,7 @@ namespace glz`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`template <class Obj, class RegistryType>`
`110`		`- static void register_object_endpoint(sv path, Obj& obj, RegistryType& reg)`
	`110`	`+ static void register_object_endpoint(const sv path, Obj& obj, RegistryType& reg)`
`111`	`111`	`{`
`112`	`112`	`std::string rest_path = convert_to_rest_path(path);`
`113`	`113`
`@@ -128,7 +128,7 @@ namespace glz`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`template <class Value, class RegistryType>`
`131`		`- static void register_value_endpoint(sv path, Value& value, RegistryType& reg)`
	`131`	`+ static void register_value_endpoint(const sv path, Value& value, RegistryType& reg)`
`132`	`132`	`{`
`133`	`133`	`std::string rest_path = convert_to_rest_path(path);`
`134`	`134`
`@@ -150,7 +150,7 @@ namespace glz`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`template <class Var, class RegistryType>`
`153`		`- static void register_variable_endpoint(sv path, Var& var, RegistryType& reg)`
	`153`	`+ static void register_variable_endpoint(const sv path, Var& var, RegistryType& reg)`
`154`	`154`	`{`
`155`	`155`	`std::string rest_path = convert_to_rest_path(path);`
`156`	`156`
`@@ -171,7 +171,7 @@ namespace glz`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`template <class T, class F, class Ret, class RegistryType>`
`174`		`- static void register_member_function_endpoint(sv path, T& value, F func, RegistryType& reg)`
	`174`	`+ static void register_member_function_endpoint(const sv path, T& value, F func, RegistryType& reg)`
`175`	`175`	`{`
`176`	`176`	`std::string rest_path = convert_to_rest_path(path);`
`177`	`177`
`@@ -189,7 +189,7 @@ namespace glz`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`template <class T, class F, class Input, class Ret, class RegistryType>`
`192`		`- static void register_member_function_with_params_endpoint(sv path, T& value, F func, RegistryType& reg)`
	`192`	`+ static void register_member_function_with_params_endpoint(const sv path, T& value, F func, RegistryType& reg)`
`193`	`193`	`{`
`194`	`194`	`std::string rest_path = convert_to_rest_path(path);`
`195`	`195`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,8 @@ namespace glz`
`143`	`143`	`}`
`144`	`144`	`else {`
`145`	`145`	`// this is a variable and not a function, so we build RPC read/write calls`
`146`		`- impl::template register_variable_endpoint<std::remove_cvref_t<Func>>(full_key, func, *this);`
	`146`	`+ // We can't remove const here, because const fields need to be able to be written`
	`147`	`+ impl::template register_variable_endpoint<std::remove_reference_t<Func>>(full_key, func, *this);`
`147`	`148`	`}`
`148`	`149`	`}`
`149`	`150`	`});`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace glz`
`23`	`23`	`struct registry_impl<Opts, REPE>`
`24`	`24`	`{`
`25`	`25`	`template <class T, class RegistryType>`
`26`		`- static void register_endpoint(sv path, T& value, RegistryType& reg)`
	`26`	`+ static void register_endpoint(const sv path, T& value, RegistryType& reg)`
`27`	`27`	`{`
`28`	`28`	`reg.endpoints[path] = [&value](repe::state&& state) mutable {`
`29`	`29`	`if (state.write()) {`
`@@ -46,7 +46,7 @@ namespace glz`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`template <class Func, class Result, class RegistryType>`
`49`		`- static void register_function_endpoint(sv path, Func& func, RegistryType& reg)`
	`49`	`+ static void register_function_endpoint(const sv path, Func& func, RegistryType& reg)`
`50`	`50`	`{`
`51`	`51`	`if constexpr (std::same_as<Result, void>) {`
`52`	`52`	`reg.endpoints[path] = [&func](repe::state&& state) mutable {`
`@@ -71,7 +71,7 @@ namespace glz`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`template <class Func, class Params, class RegistryType>`
`74`		`- static void register_param_function_endpoint(sv path, Func& func, RegistryType& reg)`
	`74`	`+ static void register_param_function_endpoint(const sv path, Func& func, RegistryType& reg)`
`75`	`75`	`{`
`76`	`76`	`reg.endpoints[path] = [&func](repe::state&& state) mutable {`
`77`	`77`	`static thread_local std::decay_t<Params> params{};`
`@@ -103,7 +103,7 @@ namespace glz`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`template <class Obj, class RegistryType>`
`106`		`- static void register_object_endpoint(sv path, Obj& obj, RegistryType& reg)`
	`106`	`+ static void register_object_endpoint(const sv path, Obj& obj, RegistryType& reg)`
`107`	`107`	`{`
`108`	`108`	`reg.endpoints[path] = [&obj](repe::state&& state) mutable {`
`109`	`109`	`if (state.write()) {`
`@@ -126,7 +126,7 @@ namespace glz`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`template <class Value, class RegistryType>`
`129`		`- static void register_value_endpoint(sv path, Value& value, RegistryType& reg)`
	`129`	`+ static void register_value_endpoint(const sv path, Value& value, RegistryType& reg)`
`130`	`130`	`{`
`131`	`131`	`reg.endpoints[path] = [value](repe::state&& state) mutable {`
`132`	`132`	`if (state.write()) {`
`@@ -150,7 +150,7 @@ namespace glz`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`template <class Var, class RegistryType>`
`153`		`- static void register_variable_endpoint(sv path, Var& var, RegistryType& reg)`
	`153`	`+ static void register_variable_endpoint(const sv path, Var& var, RegistryType& reg)`
`154`	`154`	`{`
`155`	`155`	`reg.endpoints[path] = [&var](repe::state&& state) mutable {`
`156`	`156`	`if (state.write()) {`
`@@ -174,7 +174,7 @@ namespace glz`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`template <class T, class F, class Ret, class RegistryType>`
`177`		`- static void register_member_function_endpoint(sv path, T& value, F func, RegistryType& reg)`
	`177`	`+ static void register_member_function_endpoint(const sv path, T& value, F func, RegistryType& reg)`
`178`	`178`	`{`
`179`	`179`	`reg.endpoints[path] = [&value, func](repe::state&& state) mutable {`
`180`	`180`	`if constexpr (std::same_as<Ret, void>) {`
`@@ -200,7 +200,7 @@ namespace glz`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`template <class T, class F, class Input, class Ret, class RegistryType>`
`203`		`- static void register_member_function_with_params_endpoint(sv path, T& value, F func, RegistryType& reg)`
	`203`	`+ static void register_member_function_with_params_endpoint(const sv path, T& value, F func, RegistryType& reg)`
`204`	`204`	`{`
`205`	`205`	`reg.endpoints[path] = [&value, func](repe::state&& state) mutable {`
`206`	`206`	`static thread_local Input input{};`