Fix Page.AddConsoleMessageAsync NullReferenceException (#2070)

* Fix Page.AddConsoleMessageAsync NullReferenceException

* Make fix ready for shipping

Co-authored-by: Darío Kondratiuk <[email protected]>

Author: amaitland

lib/PuppeteerSharp.Tests/PageTests/PageEventsConsoleTests.cs

@@ -198,5 +198,26 @@ await Page.EvaluateFunctionAsync(@"async () =>
             // 4. Connect to the popup and make sure it doesn't throw.
             await popupTarget.PageAsync();
         }
+
+        [SkipBrowserFact(skipFirefox: true)]
+        public async Task ShouldNotFailForNullArgument()
+        {
+            var consoleTcs = new TaskCompletionSource<string>();
+
+            void EventHandler(object sender, ConsoleEventArgs e)
+            {
+                consoleTcs.TrySetResult(e.Message.Text);
+                Page.Console -= EventHandler;
+            }
+
+            Page.Console += EventHandler;
+
+            await Task.WhenAll(
+                consoleTcs.Task,
+                Page.EvaluateExpressionAsync("console.debug(null);")
+            );
+
+            Assert.Equal("JSHandle:null", await consoleTcs.Task);
+        }
     }
 }

lib/PuppeteerSharp/Page.cs

@@ -1669,7 +1669,7 @@ private async Task AddConsoleMessageAsync(ConsoleType type, IJSHandle[] values,
                 return;
             }
 
-            var tokens = values.Select(i => i.RemoteObject.ObjectId != null || i.RemoteObject.Value.Type == JTokenType.Object
+            var tokens = values.Select(i => i.RemoteObject.ObjectId != null || i.RemoteObject.Type == RemoteObjectType.Object
                 ? i.ToString()
                 : RemoteObjectHelper.ValueFromRemoteObject<string>(i.RemoteObject));
 

lib/PuppeteerSharp/PuppeteerSharp.csproj

@@ -13,10 +13,10 @@
     <Description>Headless Browser .NET API</Description>
     <PackageId>PuppeteerSharp</PackageId>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <PackageVersion>9.0.0</PackageVersion>
-    <ReleaseVersion>9.0.0</ReleaseVersion>
-    <AssemblyVersion>9.0.0.0</AssemblyVersion>
-    <FileVersion>9.0.0.0</FileVersion>
+    <PackageVersion>9.0.1</PackageVersion>
+    <ReleaseVersion>9.0.1</ReleaseVersion>
+    <AssemblyVersion>9.0.0.1</AssemblyVersion>
+    <FileVersion>9.0.0.1</FileVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
     <CodeAnalysisRuleSet>../PuppeteerSharp.ruleset</CodeAnalysisRuleSet>