Cleanup: get/setWorkerEnv() should expect an Object, not a Value.

In fact they were already doing a runtime check for this, but by changing the types we can enforce it at compile time.

Author: kentonv

src/workerd/api/modules.c++

@@ -20,10 +20,8 @@ kj::Maybe<jsg::JsObject> EnvModule::getCurrent(jsg::Lock& js) {
   if (FeatureFlags::get(js).getDisableImportableEnv()) return kj::none;
 
   // Otherwise, fallback to provide the stored environment.
-  return js.getWorkerEnv().map([&](const jsg::Value& val) -> jsg::JsObject {
-    auto handle = val.getHandle(js);
-    JSG_REQUIRE(handle->IsObject(), TypeError, "Expected environment to be an object.");
-    return jsg::JsObject(handle.As<v8::Object>());
+  return js.getWorkerEnv().map([&](const jsg::V8Ref<v8::Object>& val) -> jsg::JsObject {
+    return jsg::JsObject(val.getHandle(js));
   });
 }
 

src/workerd/api/node/util.c++

@@ -252,10 +252,7 @@ jsg::JsValue UtilModule::getBuiltinModule(jsg::Lock& js, kj::String specifier) {
 jsg::JsObject UtilModule::getEnvObject(jsg::Lock& js) {
   if (FeatureFlags::get(js).getPopulateProcessEnv()) {
     KJ_IF_SOME(env, js.getWorkerEnv()) {
-      jsg::JsValue val(env.getHandle(js));
-      KJ_IF_SOME(obj, val.tryCast<jsg::JsObject>()) {
-        return obj;
-      }
+      return jsg::JsObject(env.getHandle(js));
     }
   }
 

src/workerd/io/worker.c++

@@ -1618,7 +1618,7 @@ Worker::Worker(kj::Own<const Script> scriptParam,
               // Use `env` variable.
               bindingsScope = v8::Object::New(lock.v8Isolate);
               if (!FeatureFlags::get(js).getDisableImportableEnv()) {
-                lock.setWorkerEnv(lock.v8Ref(bindingsScope.As<v8::Value>()));
+                lock.setWorkerEnv(lock.v8Ref(bindingsScope));
               }
             } else {
               // Use global-scope bindings.

src/workerd/jsg/jsg.h

@@ -2706,10 +2706,10 @@ class Lock {
   virtual void reportError(const JsValue& value) = 0;
 
   // Store the worker environment.
-  virtual void setWorkerEnv(Value value) = 0;
+  virtual void setWorkerEnv(V8Ref<v8::Object> value) = 0;
 
   // Retrieve the worker environment.
-  virtual kj::Maybe<Value> getWorkerEnv() = 0;
+  virtual kj::Maybe<V8Ref<v8::Object>> getWorkerEnv() = 0;
 
   // Resolve an internal module namespace from the given specifier.
   // This variation can be used only for internal built-ins.

src/workerd/jsg/setup.h

@@ -697,15 +697,13 @@ class Isolate: public IsolateBase {
       }
     }
 
-    void setWorkerEnv(Value value) override {
-      auto handle = value.getHandle(*this);
-      KJ_ASSERT(handle->IsObject());
-      jsgIsolate.workerEnvObj.Reset(v8Isolate, handle.template As<v8::Object>());
+    void setWorkerEnv(V8Ref<v8::Object> value) override {
+      jsgIsolate.workerEnvObj.Reset(v8Isolate, value.getHandle(*this));
     }
 
-    kj::Maybe<Value> getWorkerEnv() override {
+    kj::Maybe<V8Ref<v8::Object>> getWorkerEnv() override {
       if (jsgIsolate.workerEnvObj.IsEmpty()) return kj::none;
-      return v8Ref<v8::Value>(jsgIsolate.workerEnvObj.Get(v8Isolate));
+      return v8Ref<v8::Object>(jsgIsolate.workerEnvObj.Get(v8Isolate));
     }
 
    private: