Drive-by cleanup: Refactor unnecessary unsetWebSocketAutoResponse() i…

…n hibernation manager.
cloudflare · Oct 9, 2023 · 2370af7 · 2370af7
1 parent d03563f
commit 2370af7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/src/workerd/api/actor-state.c++ b/src/workerd/api/actor-state.c++
@@ -880,7 +880,7 @@ void DurableObjectState::setWebSocketAutoResponse(
     // If there's no request/response pair, we unset any current set auto response configuration.
     KJ_IF_SOME(manager, a.getHibernationManager()) {
       // If there's no hibernation manager created yet, there's nothing to do here.
-      manager.unsetWebSocketAutoResponse();
+      manager.setWebSocketAutoResponse(kj::none);
     }
     return;
   }

diff --git a/src/workerd/io/hibernation-manager.c++ b/src/workerd/io/hibernation-manager.c++
@@ -99,12 +99,12 @@ kj::Vector<jsg::Ref<api::WebSocket>> HibernationManagerImpl::getWebSockets(
 }
 
 void HibernationManagerImpl::setWebSocketAutoResponse(
-    jsg::Ref<api::WebSocketRequestResponsePair> reqResp) {
-  autoResponsePair = kj::mv(reqResp);
-}
-
-void HibernationManagerImpl::unsetWebSocketAutoResponse() {
-  autoResponsePair = kj::none;
+    kj::Maybe<jsg::Ref<api::WebSocketRequestResponsePair>> reqResp) {
+  KJ_IF_SOME(rr, reqResp){
+    autoResponsePair = kj::mv(rr);
+  } else {
+    autoResponsePair = kj::none;
+  }
 }
 
 kj::Maybe<jsg::Ref<api::WebSocketRequestResponsePair>> HibernationManagerImpl::getWebSocketAutoResponse() {

diff --git a/src/workerd/io/hibernation-manager.h b/src/workerd/io/hibernation-manager.h
@@ -40,8 +40,7 @@ class HibernationManagerImpl final : public Worker::Actor::HibernationManager {
   // This converts our activeOrPackage from an api::WebSocket to a HibernationPackage.
   void hibernateWebSockets(Worker::Lock& lock) override;
 
-  void setWebSocketAutoResponse(jsg::Ref<api::WebSocketRequestResponsePair> reqResp) override;
-  void unsetWebSocketAutoResponse() override;
+  void setWebSocketAutoResponse(kj::Maybe<jsg::Ref<api::WebSocketRequestResponsePair>> reqResp) override;
   kj::Maybe<jsg::Ref<api::WebSocketRequestResponsePair>> getWebSocketAutoResponse() override;
   void setTimerChannel(TimerChannel& timerChannel) override;
   kj::Maybe<TimerChannel&> getTimerChannel() override;

diff --git a/src/workerd/io/worker.h b/src/workerd/io/worker.h
@@ -697,8 +697,7 @@ class Worker::Actor final: public kj::Refcounted {
         jsg::Lock& js,
         kj::Maybe<kj::StringPtr> tag) = 0;
     virtual void hibernateWebSockets(Worker::Lock& lock) = 0;
-    virtual void setWebSocketAutoResponse(jsg::Ref<api::WebSocketRequestResponsePair> reqResp) = 0;
-    virtual void unsetWebSocketAutoResponse() = 0;
+    virtual void setWebSocketAutoResponse(kj::Maybe<jsg::Ref<api::WebSocketRequestResponsePair>> reqResp) = 0;
     virtual kj::Maybe<jsg::Ref<api::WebSocketRequestResponsePair>> getWebSocketAutoResponse() = 0;
     virtual void setTimerChannel(TimerChannel& timerChannel) = 0;
     virtual kj::Maybe<TimerChannel&> getTimerChannel()  = 0;