[dotnet] [bidi] Serialize base64 encoded string directly to bytes (#16203)

Author: nvborisenko

dotnet/src/webdriver/BiDi/BrowsingContext/CaptureScreenshotCommand.cs

@@ -18,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using System;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
@@ -56,9 +57,9 @@ public sealed record BoxClipRectangle(double X, double Y, double Width, double H
 
 public sealed record ElementClipRectangle(Script.ISharedReference Element) : ClipRectangle;
 
-public sealed record CaptureScreenshotResult(string Data) : EmptyResult
+public sealed record CaptureScreenshotResult(ReadOnlyMemory<byte> Data) : EmptyResult
 {
     public static implicit operator byte[](CaptureScreenshotResult captureScreenshotResult) => captureScreenshotResult.ToByteArray();
 
-    public byte[] ToByteArray() => System.Convert.FromBase64String(Data);
+    public byte[] ToByteArray() => Data.ToArray();
 }

dotnet/src/webdriver/BiDi/BrowsingContext/PrintCommand.cs

@@ -112,7 +112,7 @@ public static implicit operator PrintPageRange(Range range)
 #endif
 }
 
-public sealed record PrintResult(string Data) : EmptyResult
+public sealed record PrintResult(ReadOnlyMemory<byte> Data) : EmptyResult
 {
-    public byte[] ToByteArray() => Convert.FromBase64String(Data);
+    public byte[] ToByteArray() => Data.ToArray();
 }

dotnet/src/webdriver/BiDi/Network/BytesValue.cs

@@ -28,9 +28,9 @@ namespace OpenQA.Selenium.BiDi.Network;
 public abstract record BytesValue
 {
     public static implicit operator BytesValue(string value) => new StringBytesValue(value);
-    public static implicit operator BytesValue(byte[] value) => new Base64BytesValue(Convert.ToBase64String(value));
+    public static implicit operator BytesValue(byte[] value) => new Base64BytesValue(value);
 }
 
 public sealed record StringBytesValue(string Value) : BytesValue;
 
-public sealed record Base64BytesValue(string Value) : BytesValue;
+public sealed record Base64BytesValue(ReadOnlyMemory<byte> Value) : BytesValue;

dotnet/src/webdriver/BiDi/WebExtension/InstallCommand.cs

@@ -18,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using System;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.WebExtension;
@@ -35,7 +36,7 @@ public abstract record ExtensionData;
 
 public sealed record ExtensionArchivePath(string Path) : ExtensionData;
 
-public sealed record ExtensionBase64Encoded(string Value) : ExtensionData;
+public sealed record ExtensionBase64Encoded(ReadOnlyMemory<byte> Value) : ExtensionData;
 
 public sealed record ExtensionPath(string Path) : ExtensionData;
 

dotnet/test/common/BiDi/BrowsingContext/BrowsingContextTest.cs

@@ -250,7 +250,7 @@ public async Task CanCaptureScreenshot()
         var screenshot = await context.CaptureScreenshotAsync();
 
         Assert.That(screenshot, Is.Not.Null);
-        Assert.That(screenshot.Data, Is.Not.Empty);
+        Assert.That(screenshot.Data.Length, Is.Not.Zero);
     }
 
     [Test]
@@ -263,7 +263,7 @@ public async Task CanCaptureScreenshotWithParameters()
         });
 
         Assert.That(screenshot, Is.Not.Null);
-        Assert.That(screenshot.Data, Is.Not.Empty);
+        Assert.That(screenshot.Data.Length, Is.Not.Zero);
     }
 
     [Test]
@@ -276,7 +276,7 @@ public async Task CanCaptureScreenshotOfViewport()
         });
 
         Assert.That(screenshot, Is.Not.Null);
-        Assert.That(screenshot.Data, Is.Not.Empty);
+        Assert.That(screenshot.Data.Length, Is.Not.Zero);
     }
 
     [Test]
@@ -292,7 +292,7 @@ public async Task CanCaptureScreenshotOfElement()
         });
 
         Assert.That(screenshot, Is.Not.Null);
-        Assert.That(screenshot.Data, Is.Not.Empty);
+        Assert.That(screenshot.Data.Length, Is.Not.Zero);
     }
 
     [Test]
@@ -313,6 +313,6 @@ public async Task CanPrintPage()
         var pdf = await context.PrintAsync();
 
         Assert.That(pdf, Is.Not.Null);
-        Assert.That(pdf.Data, Is.Not.Empty);
+        Assert.That(pdf.Data.Length, Is.Not.Zero);
     }
 }

dotnet/test/common/BiDi/WebExtension/WebExtensionTest.cs

@@ -64,9 +64,9 @@ public async Task CanInstallBase64WebExtension()
     {
         var path = LocateRelativePath("common/extensions/webextensions-selenium-example.zip");
 
-        string base64 = Convert.ToBase64String(File.ReadAllBytes(path));
+        var bytes = File.ReadAllBytes(path);
 
-        var result = await bidi.WebExtension.InstallAsync(new ExtensionBase64Encoded(base64));
+        var result = await bidi.WebExtension.InstallAsync(new ExtensionBase64Encoded(bytes));
 
         Assert.That(result, Is.Not.Null);
         Assert.That(result.Extension, Is.Not.Null);