Add updateConfiguration function to jsg Isolates

This can be used to update the given configuration at runtime. Note that while some jsg structs are lazily using the configuration, others can use it at construction and will have the original configuration value.
cloudflare · Nov 7, 2024 · 23172a2 · 23172a2
1 parent 8bf3af4
commit 23172a2
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 2 deletions.
diff --git a/src/workerd/jsg/promise.h b/src/workerd/jsg/promise.h
@@ -572,6 +572,11 @@ class PromiseWrapper {
   // std::nullptr_t). The getConfig allows us to handle any case using reasonable defaults.
   PromiseWrapper(const auto& config): config(getConfig(config)) {}
 
+  template <typename MetaConfiguration>
+  void updateConfiguration(MetaConfiguration&& configuration) {
+    config = getConfig(kj::fwd<MetaConfiguration>(configuration));
+  }
+
   template <typename T>
   static constexpr const char* getName(Promise<T>*) {
     return "Promise";
@@ -668,7 +673,7 @@ class PromiseWrapper {
   }
 
 private:
-  const JsgConfig config;
+  JsgConfig config;
 
   static bool isThenable(v8::Local<v8::Context> context, v8::Local<v8::Value> handle) {
     if (handle->IsObject()) {

diff --git a/src/workerd/jsg/resource.h b/src/workerd/jsg/resource.h
@@ -1349,6 +1349,11 @@ class ResourceWrapper {
   ResourceWrapper(MetaConfiguration&& configuration)
       : configuration(kj::fwd<MetaConfiguration>(configuration)) {}
 
+  template <typename MetaConfiguration>
+  void updateConfiguration(MetaConfiguration&& config) {
+    configuration = kj::fwd<MetaConfiguration>(config);
+  }
+
   inline void initTypeWrapper() {
     TypeWrapper& wrapper = static_cast<TypeWrapper&>(*this);
     wrapper.resourceTypeMap.insert(typeid(T),

diff --git a/src/workerd/jsg/setup.h b/src/workerd/jsg/setup.h
@@ -409,6 +409,11 @@ class Isolate: public IsolateBase {
     dropWrappers(kj::mv(wrapper));
   }
 
+  template <typename MetaConfiguration>
+  void updateConfiguration(MetaConfiguration&& configuration) {
+    wrapper->updateConfiguration(kj::fwd<MetaConfiguration>(configuration));
+  }
+
   kj::Exception unwrapException(
       v8::Local<v8::Context> context, v8::Local<v8::Value> exception) override {
     return wrapper->template unwrap<kj::Exception>(

diff --git a/src/workerd/jsg/type-wrapper.h b/src/workerd/jsg/type-wrapper.h
@@ -246,6 +246,9 @@ class TypeWrapperBase<Self, T, JsgKind::STRUCT>
 
   inline void initTypeWrapper() {}
 
+  template <typename MetaConfiguration>
+  void updateConfiguration(MetaConfiguration&& configuration) {}
+
   void unwrap() = delete;  // StructWrapper only implements tryUnwrap(), not unwrap()
 };
 
@@ -274,6 +277,9 @@ class TypeWrapperBase<Self, TypeWrapperExtension<Extension>, JsgKind::EXTENSION>
   void unwrap() = delete;  // extensions only implement tryUnwrap(), not unwrap()
 
   inline void initTypeWrapper() {}
+
+  template <typename MetaConfiguration>
+  void updateConfiguration(MetaConfiguration&& configuration) {}
 };
 
 // Specialization of TypeWrapperBase for InjectConfiguration.
@@ -298,6 +304,11 @@ class TypeWrapperBase<Self, InjectConfiguration<Configuration>, JsgKind::EXTENSI
 
   inline void initTypeWrapper() {}
 
+  template <typename MetaConfiguration>
+  void updateConfiguration(MetaConfiguration&& config) {
+    configuration = kj::fwd<MetaConfiguration>(config);
+  }
+
 private:
   Configuration configuration;
 };
@@ -411,6 +422,13 @@ class TypeWrapper: public DynamicResourceTypeMap<Self>,
     (TypeWrapperBase<Self, T>::initTypeWrapper(), ...);
   }
 
+  template <typename MetaConfiguration>
+  void updateConfiguration(MetaConfiguration&& configuration) {
+    (TypeWrapperBase<Self, T>::updateConfiguration(kj::fwd<MetaConfiguration>(configuration)), ...);
+    MaybeWrapper<Self>::updateConfiguration(kj::fwd<MetaConfiguration>(configuration));
+    PromiseWrapper<Self>::updateConfiguration(kj::fwd<MetaConfiguration>(configuration));
+  }
+
   static TypeWrapper& from(v8::Isolate* isolate) {
     return *reinterpret_cast<TypeWrapper*>(isolate->GetData(1));
   }

diff --git a/src/workerd/jsg/value.h b/src/workerd/jsg/value.h
@@ -587,6 +587,11 @@ class MaybeWrapper {
   // The getConfig allows us to handle any case using reasonable defaults.
   MaybeWrapper(const auto& config): config(getConfig(config)) {}
 
+  template <typename MetaConfiguration>
+  void updateConfiguration(MetaConfiguration&& configuration) {
+    config = getConfig(kj::fwd<MetaConfiguration>(configuration));
+  }
+
   template <typename U>
   static constexpr decltype(auto) getName(kj::Maybe<U>*) {
     return TypeWrapper::getName((kj::Decay<U>*)nullptr);
@@ -623,7 +628,7 @@ class MaybeWrapper {
   }
 
 private:
-  const JsgConfig config;
+  JsgConfig config;
 };
 
 // =======================================================================================