fix and tests

hardkoded · Feb 18, 2025 · 259df14 · 259df14
1 parent 6d44502
commit 259df14
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/lib/PuppeteerSharp.Tests/NetworkTests/RequestPostDataTests.cs b/lib/PuppeteerSharp.Tests/NetworkTests/RequestPostDataTests.cs
@@ -19,6 +19,30 @@ public async Task ShouldWork()
             Assert.That(request.PostData, Is.EqualTo("{\"foo\":\"bar\"}"));
         }
 
+        [Test, Retry(2), PuppeteerTest("network.spec", "PuppeteerSharp network Request.postData", "should work plain text")]
+        public async Task ShouldWorkPlainText()
+        {
+            await Page.GoToAsync(TestConstants.EmptyPage);
+            Server.SetRoute("/post", _ => Task.CompletedTask);
+            var requestTask = Page.WaitForRequestAsync((request) => !TestUtils.IsFavicon(request));
+            await Page.EvaluateExpressionHandleAsync("fetch('./post', { method: 'POST', body: 'Hello, world!'})");
+            var request = await requestTask.WithTimeout();
+            Assert.That(request, Is.Not.Null);
+            Assert.That(request.PostData, Is.EqualTo("Hello, world!"));
+        }
+
+        [Test, Retry(2), PuppeteerTest("network.spec", "PuppeteerSharpnetwork Request.postData", "should work with low surrogate")]
+        public async Task ShouldWorkWithLowSurrogate()
+        {
+            await Page.GoToAsync(TestConstants.EmptyPage);
+            Server.SetRoute("/post", _ => Task.CompletedTask);
+            var requestTask = Page.WaitForRequestAsync((request) => !TestUtils.IsFavicon(request));
+            await Page.EvaluateExpressionHandleAsync("fetch('./post', { method: 'POST', body: 'Hello, world!\uDD71'})");
+            var request = await requestTask.WithTimeout();
+            Assert.That(request, Is.Not.Null);
+            Assert.That(request.PostData, Is.EqualTo("Hello, world!\uFFFD"));
+        }
+
         [Test, Retry(2), PuppeteerTest("network.spec", "network Request.postData", "should be |undefined| when there is no post data")]
         public async Task ShouldBeUndefinedWhenThereIsNoPostData()
         {

diff --git a/lib/PuppeteerSharp/Helpers/Json/LowSurrogateConverter.cs b/lib/PuppeteerSharp/Helpers/Json/LowSurrogateConverter.cs
@@ -16,11 +16,24 @@ public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
         }
 
         var span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan.ToArray();
-        return Encoding.UTF8.GetString(span);
+        var value = Encoding.UTF8.GetString(span);
+
+        if (reader.ValueIsEscaped)
+        {
+            value = JsonUnescape(value);
+        }
+
+        return value;
     }
 
     public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
     {
         writer.WriteStringValue(value);
     }
+
+    private static string JsonUnescape(string jsonString)
+    {
+        using var doc = JsonDocument.Parse($"\"{jsonString}\"");
+        return doc.RootElement.GetString();
+    }
 }