Merge pull request #5679 from cloudflare/jasnell/refcountedwrapper-duplication

Author: jasnell

src/workerd/api/kv.c++

@@ -179,12 +179,7 @@ jsg::Promise<jsg::JsRef<jsg::JsMap>> KvNamespace::getBulk(jsg::Lock& js,
         [client = kj::mv(client), urlStr = kj::mv(urlStr), headers = kj::mv(headers),
             expectedBodySize, supportedBody = kj::mv(body)]() mutable {
       auto innerReq = client->request(kj::HttpMethod::POST, urlStr, headers, expectedBodySize);
-      struct RefcountedWrapper: public kj::Refcounted {
-        explicit RefcountedWrapper(kj::Own<kj::HttpClient> client): client(kj::mv(client)) {}
-        kj::Own<kj::HttpClient> client;
-      };
-      auto rcClient = kj::refcounted<RefcountedWrapper>(kj::mv(client));
-      auto req = attachToRequest(kj::mv(innerReq), kj::mv(rcClient));
+      auto req = attachToRequest(kj::mv(innerReq), kj::refcountedWrapper(kj::mv(client)));
 
       kj::Promise<void> writePromise = nullptr;
       writePromise = req.body->write(supportedBody.asBytes()).attach(kj::mv(supportedBody));
@@ -638,13 +633,8 @@ jsg::Promise<void> KvNamespace::put(jsg::Lock& js,
         [&context, client = kj::mv(client), urlStr = kj::mv(urlStr), headers = kj::mv(headers),
             expectedBodySize, supportedBody = kj::mv(supportedBody)]() mutable {
       auto innerReq = client->request(kj::HttpMethod::PUT, urlStr, headers, expectedBodySize);
-      struct RefcountedWrapper: public kj::Refcounted {
-        explicit RefcountedWrapper(kj::Own<kj::HttpClient> client): client(kj::mv(client)) {}
-        kj::Own<kj::HttpClient> client;
-      };
-      auto rcClient = kj::refcounted<RefcountedWrapper>(kj::mv(client));
       // TODO(perf): More efficient to explicitly attach rcClient below?
-      auto req = attachToRequest(kj::mv(innerReq), kj::mv(rcClient));
+      auto req = attachToRequest(kj::mv(innerReq), kj::refcountedWrapper(kj::mv(client)));
 
       kj::Promise<void> writePromise = nullptr;
       KJ_SWITCH_ONEOF(supportedBody) {

src/workerd/server/server.c++

@@ -3225,13 +3225,7 @@ class Server::WorkerService final: public Service,
     co_await context.waitForOutputLocks();
 
     auto innerReq = client->request(kj::HttpMethod::POST, urlStr, headers, requestJson.size());
-
-    struct RefcountedWrapper: public kj::Refcounted {
-      explicit RefcountedWrapper(kj::Own<kj::HttpClient> client): client(kj::mv(client)) {}
-      kj::Own<kj::HttpClient> client;
-    };
-    auto rcClient = kj::refcounted<RefcountedWrapper>(kj::mv(client));
-    auto request = attachToRequest(kj::mv(innerReq), kj::mv(rcClient));
+    auto request = attachToRequest(kj::mv(innerReq), kj::refcountedWrapper(kj::mv(client)));
 
     co_await request.body->write(requestJson.asBytes())
         .attach(kj::mv(requestJson), kj::mv(request.body));