remove unnecessary url tests

cloudflare · Feb 11, 2025 · 30d797a · 30d797a
1 parent 58c568a
commit 30d797a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/workerd/jsg/jsvalue.c++ b/src/workerd/jsg/jsvalue.c++
@@ -286,8 +286,10 @@ JsString::WriteIntoStatus JsString::writeInto(
     Lock& js, kj::ArrayPtr<char> buffer, WriteOptions options) const {
   WriteIntoStatus result = {0, 0};
   if (buffer.size() > 0) {
-    result.written =
-        inner->WriteUtf8(js.v8Isolate, buffer.begin(), buffer.size(), &result.read, options);
+    result.written = inner->WriteUtf8V2(js.v8Isolate, buffer.begin(), buffer.size(), options);
+    if (result.written > 0) {
+      result.read = length(js);
+    }
   }
   return result;
 }
@@ -296,7 +298,9 @@ JsString::WriteIntoStatus JsString::writeInto(
     Lock& js, kj::ArrayPtr<uint16_t> buffer, WriteOptions options) const {
   WriteIntoStatus result = {0, 0};
   if (buffer.size() > 0) {
-    result.written = inner->Write(js.v8Isolate, buffer.begin(), 0, buffer.size(), options);
+    inner->WriteV2(js.v8Isolate, 0, buffer.size(), buffer.begin(), options);
+    result.read = length(js);
+    result.written = length(js);
   }
   return result;
 }
@@ -305,7 +309,9 @@ JsString::WriteIntoStatus JsString::writeInto(
     Lock& js, kj::ArrayPtr<kj::byte> buffer, WriteOptions options) const {
   WriteIntoStatus result = {0, 0};
   if (buffer.size() > 0) {
-    result.written = inner->WriteOneByte(js.v8Isolate, buffer.begin(), 0, buffer.size(), options);
+    inner->WriteOneByteV2(js.v8Isolate, 0, buffer.size(), buffer.begin(), options);
+    result.read = length(js);
+    result.written = length(js);
   }
   return result;
 }

diff --git a/src/workerd/jsg/jsvalue.h b/src/workerd/jsg/jsvalue.h
@@ -249,10 +249,9 @@ class JsString final: public JsBase<v8::String, JsString> {
   static JsString concat(Lock& js, const JsString& one, const JsString& two) KJ_WARN_UNUSED_RESULT;
 
   enum WriteOptions {
-    NONE = v8::String::NO_OPTIONS,
-    NO_NULL_TERMINATION = v8::String::NO_NULL_TERMINATION,
-    PRESERVE_ONE_BYTE_NULL = v8::String::PRESERVE_ONE_BYTE_NULL,
-    REPLACE_INVALID_UTF8 = v8::String::REPLACE_INVALID_UTF8,
+    NONE = v8::String::WriteFlags::kNullTerminate,
+    NO_NULL_TERMINATION = v8::String::WriteFlags::kNone,
+    REPLACE_INVALID_UTF8 = v8::String::WriteFlags::kReplaceInvalidUtf8,
   };
 
   template <typename T>