Don't emit an internal error when eval causes navigation (#621)

Author: kblok

lib/PuppeteerSharp/FrameManager.cs

@@ -39,21 +39,20 @@ internal FrameManager(CDPSession client, FrameTree frameTree, Page page)
 
         #region Public Methods
 
-        internal JSHandle CreateJSHandle(int contextId, dynamic remoteObject)
+        internal JSHandle CreateJSHandle(ExecutionContext context, dynamic remoteObject)
+            => remoteObject.subtype == "node"
+                ? new ElementHandle(context, _client, remoteObject, _page, this)
+                : new JSHandle(context, _client, remoteObject);
+
+        internal ExecutionContext ExecutionContextById(int contextId)
         {
-            _contextIdToContext.TryGetValue(contextId, out var storedContext);
+            _contextIdToContext.TryGetValue(contextId, out var context);
 
-            if (storedContext == null)
+            if (context == null)
             {
                 _logger.LogError("INTERNAL ERROR: missing context with id = {ContextId}", contextId);
             }
-
-            if (remoteObject.subtype == "node")
-            {
-                return new ElementHandle(storedContext, _client, remoteObject, _page, this);
-            }
-
-            return new JSHandle(storedContext, _client, remoteObject);
+            return context;
         }
 
         #endregion
@@ -150,7 +149,7 @@ private void OnExecutionContextCreated(ContextPayload contextPayload)
             var context = new ExecutionContext(
                 _client,
                 contextPayload,
-                (ctx, remoteObject) => CreateJSHandle(contextPayload.Id, remoteObject),
+                (ctx, remoteObject) => CreateJSHandle(ctx, remoteObject),
                 frame);
 
             _contextIdToContext[contextPayload.Id] = context;

lib/PuppeteerSharp/Page.cs

@@ -1941,8 +1941,8 @@ private void OnDialog(PageJavascriptDialogOpeningResponse message)
 
         private async Task OnConsoleAPI(PageConsoleResponse message)
         {
-            var values = message.Args.Select<dynamic, JSHandle>(i =>
-                _frameManager.CreateJSHandle(message.ExecutionContextId, i)).ToArray();
+            var ctx = _frameManager.ExecutionContextById(message.ExecutionContextId);
+            var values = message.Args.Select<dynamic, JSHandle>(i => _frameManager.CreateJSHandle(ctx, i)).ToArray();
             await AddConsoleMessage(message.Type, values);
         }