diff --git a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json index 661f69ee9..262befaa8 100644 --- a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json +++ b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json @@ -69,6 +69,13 @@ "parameters": ["firefox", "headful"], "expectations": ["FAIL"] }, + { + "comment": "", + "testIdPattern": "[puppeteer-sharp] *", + "platforms": ["darwin", "linux", "win32"], + "parameters": ["firefox"], + "expectations": ["FAIL"] + }, { "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one", "testIdPattern": "[accessibility.spec] *", diff --git a/lib/PuppeteerSharp.Tests/CDPSessionTests/CreateCDPSessionTests.cs b/lib/PuppeteerSharp.Tests/CDPSessionTests/CreateCDPSessionTests.cs index c80e35d07..f6e3822b7 100644 --- a/lib/PuppeteerSharp.Tests/CDPSessionTests/CreateCDPSessionTests.cs +++ b/lib/PuppeteerSharp.Tests/CDPSessionTests/CreateCDPSessionTests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Newtonsoft.Json.Linq; using NUnit.Framework; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.CDPSessionTests diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptCancelTests.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptCancelTests.cs index eb64cd655..7e4f88c28 100644 --- a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptCancelTests.cs +++ b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptCancelTests.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; using NUnit.Framework; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.DeviceRequestPromptTests; diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptDevicesTests.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptDevicesTests.cs index d59e95177..a8a74a824 100644 --- a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptDevicesTests.cs +++ b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptDevicesTests.cs @@ -1,5 +1,5 @@ using NUnit.Framework; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.DeviceRequestPromptTests; diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptSelectTests.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptSelectTests.cs index d44dbe90e..d005eed00 100644 --- a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptSelectTests.cs +++ b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptSelectTests.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using NUnit.Framework; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.DeviceRequestPromptTests; diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptWaitForDeviceTests.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptWaitForDeviceTests.cs index 95712e306..47fdbf820 100644 --- a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptWaitForDeviceTests.cs +++ b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/DeviceRequestPromptWaitForDeviceTests.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; using NUnit.Framework; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.DeviceRequestPromptTests; diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/MockCDPSession.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/MockCDPSession.cs index c38fce96f..10c2a1bec 100644 --- a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/MockCDPSession.cs +++ b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/MockCDPSession.cs @@ -24,7 +24,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp.Tests.DeviceRequestPromptTests; diff --git a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/WaitForDevicePromptTests.cs b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/WaitForDevicePromptTests.cs index 365761561..15763a3be 100644 --- a/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/WaitForDevicePromptTests.cs +++ b/lib/PuppeteerSharp.Tests/DeviceRequestPromptTests/WaitForDevicePromptTests.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Newtonsoft.Json.Linq; using NUnit.Framework; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.DeviceRequestPromptTests diff --git a/lib/PuppeteerSharp.Tests/ExtensionsTests/ExtensionsTests.cs b/lib/PuppeteerSharp.Tests/ExtensionsTests/ExtensionsTests.cs index 85a390cf9..75829542d 100644 --- a/lib/PuppeteerSharp.Tests/ExtensionsTests/ExtensionsTests.cs +++ b/lib/PuppeteerSharp.Tests/ExtensionsTests/ExtensionsTests.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using NUnit.Framework; using PuppeteerSharp.Helpers; -using PuppeteerSharp.Messaging; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.ExtensionsTests diff --git a/lib/PuppeteerSharp.Tests/HeadfulTests/HeadfulTests.cs b/lib/PuppeteerSharp.Tests/HeadfulTests/HeadfulTests.cs index 59c5630ec..1b584bf51 100644 --- a/lib/PuppeteerSharp.Tests/HeadfulTests/HeadfulTests.cs +++ b/lib/PuppeteerSharp.Tests/HeadfulTests/HeadfulTests.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using NUnit.Framework; using PuppeteerSharp.Helpers; -using PuppeteerSharp.Messaging; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.HeadfulTests diff --git a/lib/PuppeteerSharp.Tests/NetworkManagerTests/NetworkManagerTests.cs b/lib/PuppeteerSharp.Tests/NetworkManagerTests/NetworkManagerTests.cs index 79a0c8880..407139df3 100644 --- a/lib/PuppeteerSharp.Tests/NetworkManagerTests/NetworkManagerTests.cs +++ b/lib/PuppeteerSharp.Tests/NetworkManagerTests/NetworkManagerTests.cs @@ -8,7 +8,7 @@ using NSubstitute; using NUnit.Framework; using PuppeteerSharp.Cdp; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.NetworkManagerTests; diff --git a/lib/PuppeteerSharp.Tests/OOPIFTests/OOPIFTests.cs b/lib/PuppeteerSharp.Tests/OOPIFTests/OOPIFTests.cs index 99b77433d..de369b60d 100644 --- a/lib/PuppeteerSharp.Tests/OOPIFTests/OOPIFTests.cs +++ b/lib/PuppeteerSharp.Tests/OOPIFTests/OOPIFTests.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Threading.Tasks; using NUnit.Framework; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; -using PuppeteerSharp.Messaging; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.OOPIFTests diff --git a/lib/PuppeteerSharp.Tests/PageTests/ExposeFunctionTests.cs b/lib/PuppeteerSharp.Tests/PageTests/ExposeFunctionTests.cs index 5763f9fe1..715558ccd 100644 --- a/lib/PuppeteerSharp.Tests/PageTests/ExposeFunctionTests.cs +++ b/lib/PuppeteerSharp.Tests/PageTests/ExposeFunctionTests.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Newtonsoft.Json.Linq; using NUnit.Framework; +using PuppeteerSharp.Cdp; using PuppeteerSharp.Nunit; namespace PuppeteerSharp.Tests.PageTests @@ -124,6 +125,7 @@ public async Task ShouldWorkWithComplexObjects() Assert.AreEqual(7, result.SelectToken("x").ToObject()); } + [Test, Retry(2), PuppeteerTest("puppeteer-sharp", "ExposeFunctionTests", "should await returned task")] public async Task ShouldAwaitReturnedTask() { var called = false; @@ -136,6 +138,7 @@ await Page.ExposeFunctionAsync("changeFlag", () => Assert.True(called); } + [Test, Retry(2), PuppeteerTest("puppeteer-sharp", "ExposeFunctionTests", "should work with action")] public async Task ShouldWorkWithAction() { var called = false; @@ -147,6 +150,7 @@ await Page.ExposeFunctionAsync("changeFlag", () => Assert.True(called); } + [Test, Retry(2), PuppeteerTest("puppeteer-sharp", "ExposeFunctionTests", "should keel the callback clean")] public async Task ShouldKeepTheCallbackClean() { await Page.ExposeFunctionAsync("compute", (int a, int b) => a * b); @@ -156,7 +160,7 @@ public async Task ShouldKeepTheCallbackClean() await Task.Delay(300); // For CI/CD debugging purposes - var session = (CDPSession)Page.Client; + var session = (CdpCDPSession)Page.Client; var message = "Expected an empty callback list. Found: \n"; if (session.HasPendingCallbacks()) @@ -167,7 +171,7 @@ public async Task ShouldKeepTheCallbackClean() } } - Assert.False(((CDPSession)Page.Client).HasPendingCallbacks(), message); + Assert.False(((CdpCDPSession)Page.Client).HasPendingCallbacks(), message); } } } diff --git a/lib/PuppeteerSharp/Binding.cs b/lib/PuppeteerSharp/Binding.cs index cf307e1b4..56aa0e1e2 100644 --- a/lib/PuppeteerSharp/Binding.cs +++ b/lib/PuppeteerSharp/Binding.cs @@ -3,6 +3,7 @@ using System.Reflection; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp { @@ -52,7 +53,7 @@ internal async Task RunAsync( { switch (handle.RemoteObject.Subtype) { - case Messaging.RemoteObjectSubtype.Node: + case RemoteObjectSubtype.Node: args[index] = handle; break; diff --git a/lib/PuppeteerSharp/BindingUtils.cs b/lib/PuppeteerSharp/BindingUtils.cs index 1a866b33e..1b52b97b3 100644 --- a/lib/PuppeteerSharp/BindingUtils.cs +++ b/lib/PuppeteerSharp/BindingUtils.cs @@ -4,8 +4,8 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/Browser.cs b/lib/PuppeteerSharp/Browser.cs index 131cc991d..443c1bf8d 100644 --- a/lib/PuppeteerSharp/Browser.cs +++ b/lib/PuppeteerSharp/Browser.cs @@ -6,8 +6,8 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using PuppeteerSharp.Cdp; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/BrowserContext.cs b/lib/PuppeteerSharp/BrowserContext.cs index 9ccfd1bbb..a0f8dd155 100644 --- a/lib/PuppeteerSharp/BrowserContext.cs +++ b/lib/PuppeteerSharp/BrowserContext.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/BrowserContextOptions.cs b/lib/PuppeteerSharp/BrowserContextOptions.cs index 31721c06b..c8dbc5d5a 100644 --- a/lib/PuppeteerSharp/BrowserContextOptions.cs +++ b/lib/PuppeteerSharp/BrowserContextOptions.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; using PuppeteerSharp.QueryHandlers; namespace PuppeteerSharp diff --git a/lib/PuppeteerSharp/CDPSession.cs b/lib/PuppeteerSharp/CDPSession.cs index c80df7a87..de009b1fa 100644 --- a/lib/PuppeteerSharp/CDPSession.cs +++ b/lib/PuppeteerSharp/CDPSession.cs @@ -1,32 +1,14 @@ using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; -using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp { /// - public class CDPSession : ICDPSession + public abstract class CDPSession : ICDPSession { - private readonly ConcurrentDictionary _callbacks = new(); - private readonly string _parentSessionId; - private int _lastId; - - internal CDPSession(Connection connection, TargetType targetType, string sessionId, string parentSessionId) - { - Connection = connection; - TargetType = targetType; - Id = sessionId; - _parentSessionId = parentSessionId; - } - /// public event EventHandler MessageReceived; @@ -44,26 +26,16 @@ internal CDPSession(Connection connection, TargetType targetType, string session internal event EventHandler Swapped; /// - public TargetType TargetType { get; } - - /// - public string Id { get; } - - /// - public bool IsClosed { get; internal set; } - - /// - public string CloseReason { get; private set; } + public string Id { get; init; } /// public ILoggerFactory LoggerFactory => Connection.LoggerFactory; - internal Connection Connection { get; private set; } + internal Connection Connection { get; set; } internal Target Target { get; set; } - internal CDPSession ParentSession - => string.IsNullOrEmpty(_parentSessionId) ? this : Connection.GetSession(_parentSessionId) ?? this; + internal abstract CDPSession ParentSession { get; } /// public async Task SendAsync(string method, object args = null, CommandOptions options = null) @@ -73,107 +45,14 @@ public async Task SendAsync(string method, object args = null, CommandOpti } /// - public async Task SendAsync(string method, object args = null, bool waitForCallback = true, CommandOptions options = null) - { - if (Connection == null) - { - throw new TargetClosedException( - $"Protocol error ({method}): Session closed. " + - $"Most likely the {TargetType} has been closed." + - $"Close reason: {CloseReason}", - CloseReason); - } - - var id = GetMessageID(); - var message = Connection.GetMessage(id, method, args, Id); - - MessageTask callback = null; - if (waitForCallback) - { - callback = new MessageTask - { - TaskWrapper = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously), - Method = method, - Message = message, - }; - _callbacks[id] = callback; - } - - try - { - await Connection.RawSendAsync(message, options).ConfigureAwait(false); - } - catch (Exception ex) - { - if (waitForCallback && _callbacks.TryRemove(id, out _)) - { - callback.TaskWrapper.TrySetException(new MessageException(ex.Message, ex)); - } - } - - return waitForCallback ? await callback.TaskWrapper.Task.WithTimeout(options?.Timeout ?? Connection.ProtocolTimeout).ConfigureAwait(false) : null; - } + public abstract Task SendAsync(string method, object args = null, bool waitForCallback = true, CommandOptions options = null); /// - public Task DetachAsync() - { - if (Connection == null) - { - throw new PuppeteerException($"Session already detached.Most likely the {TargetType} has been closed."); - } - - return Connection.SendAsync("Target.detachFromTarget", new TargetDetachFromTargetRequest - { - SessionId = Id, - }); - } - - internal bool HasPendingCallbacks() => !_callbacks.IsEmpty; + public abstract Task DetachAsync(); internal void OnSessionReady(CDPSession session) => Ready?.Invoke(this, new SessionEventArgs(session)); - internal void OnMessage(ConnectionResponse obj) - { - var id = obj.Id; - - if (id.HasValue && _callbacks.TryRemove(id.Value, out var callback)) - { - Connection.MessageQueue.Enqueue(callback, obj); - } - else - { - var method = obj.Method; - MessageReceived?.Invoke(this, new MessageEventArgs - { - MessageID = method, - MessageData = obj.Params, - }); - } - } - - internal int GetMessageID() => Interlocked.Increment(ref _lastId); - - internal void Close(string closeReason) - { - if (IsClosed) - { - return; - } - - CloseReason = closeReason; - IsClosed = true; - - foreach (var callback in _callbacks.Values.ToArray()) - { - callback.TaskWrapper.TrySetException(new TargetClosedException( - $"Protocol error({callback.Method}): Target closed.", - closeReason)); - } - - _callbacks.Clear(); - Disconnected?.Invoke(this, EventArgs.Empty); - Connection = null; - } + internal abstract void Close(string closeReason); internal void OnSessionAttached(CDPSession session) => SessionAttached?.Invoke(this, new SessionEventArgs(session)); @@ -181,8 +60,17 @@ internal void OnSessionAttached(CDPSession session) internal void OnSessionDetached(CDPSession session) => SessionDetached?.Invoke(this, new SessionEventArgs(session)); - internal IEnumerable GetPendingMessages() => _callbacks.Values; - internal void OnSwapped(CDPSession session) => Swapped?.Invoke(this, new SessionEventArgs(session)); + + /// + /// Emits event. + /// + /// Event arguments. + protected void OnMessageReceived(MessageEventArgs e) => MessageReceived?.Invoke(this, e); + + /// + /// Emits event. + /// + protected void OnDisconnected() => Disconnected?.Invoke(this, EventArgs.Empty); } } diff --git a/lib/PuppeteerSharp/Cdp/CdpCDPSession.cs b/lib/PuppeteerSharp/Cdp/CdpCDPSession.cs new file mode 100644 index 000000000..353870905 --- /dev/null +++ b/lib/PuppeteerSharp/Cdp/CdpCDPSession.cs @@ -0,0 +1,161 @@ +// * MIT License +// * +// * Copyright (c) Darío Kondratiuk +// * +// * Permission is hereby granted, free of charge, to any person obtaining a copy +// * of this software and associated documentation files (the "Software"), to deal +// * in the Software without restriction, including without limitation the rights +// * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// * copies of the Software, and to permit persons to whom the Software is +// * furnished to do so, subject to the following conditions: +// * +// * The above copyright notice and this permission notice shall be included in all +// * copies or substantial portions of the Software. +// * +// * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// * SOFTWARE. + +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Newtonsoft.Json.Linq; +using PuppeteerSharp.Cdp.Messaging; +using PuppeteerSharp.Helpers; + +namespace PuppeteerSharp.Cdp; + +// This is a pretty terrible name, but it matches upstream + +/// +public class CdpCDPSession : CDPSession +{ + private readonly ConcurrentDictionary _callbacks = new(); + private readonly string _parentSessionId; + private readonly TargetType _targetType; + private int _lastId; + private string _closeReason; + + internal CdpCDPSession(Connection connection, TargetType targetType, string sessionId, string parentSessionId) + { + Connection = connection; + _targetType = targetType; + Id = sessionId; + _parentSessionId = parentSessionId; + } + + internal override CDPSession ParentSession + => string.IsNullOrEmpty(_parentSessionId) ? this : Connection.GetSession(_parentSessionId) ?? this; + + internal bool IsClosed { get; private set; } + + /// + public override Task DetachAsync() + { + if (Connection == null) + { + throw new PuppeteerException($"Session already detached.Most likely the {_targetType} has been closed."); + } + + return Connection.SendAsync("Target.detachFromTarget", new TargetDetachFromTargetRequest + { + SessionId = Id, + }); + } + + /// + public override async Task SendAsync(string method, object args = null, bool waitForCallback = true, CommandOptions options = null) + { + if (Connection == null) + { + throw new TargetClosedException( + $"Protocol error ({method}): Session closed. " + + $"Most likely the {_targetType} has been closed." + + $"Close reason: {_closeReason}", + _closeReason); + } + + var id = GetMessageID(); + var message = Connection.GetMessage(id, method, args, Id); + + MessageTask callback = null; + if (waitForCallback) + { + callback = new MessageTask + { + TaskWrapper = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously), + Method = method, + Message = message, + }; + _callbacks[id] = callback; + } + + try + { + await Connection.RawSendAsync(message, options).ConfigureAwait(false); + } + catch (Exception ex) + { + if (waitForCallback && _callbacks.TryRemove(id, out _)) + { + callback.TaskWrapper.TrySetException(new MessageException(ex.Message, ex)); + } + } + + return waitForCallback ? await callback.TaskWrapper.Task.WithTimeout(options?.Timeout ?? Connection.ProtocolTimeout).ConfigureAwait(false) : null; + } + + internal bool HasPendingCallbacks() => !_callbacks.IsEmpty; + + internal int GetMessageID() => Interlocked.Increment(ref _lastId); + + internal IEnumerable GetPendingMessages() => _callbacks.Values; + + internal void OnMessage(ConnectionResponse obj) + { + var id = obj.Id; + + if (id.HasValue && _callbacks.TryRemove(id.Value, out var callback)) + { + Connection.MessageQueue.Enqueue(callback, obj); + } + else + { + var method = obj.Method; + OnMessageReceived(new MessageEventArgs + { + MessageID = method, + MessageData = obj.Params, + }); + } + } + + internal override void Close(string closeReason) + { + if (IsClosed) + { + return; + } + + _closeReason = closeReason; + IsClosed = true; + + foreach (var callback in _callbacks.Values.ToArray()) + { + callback.TaskWrapper.TrySetException(new TargetClosedException( + $"Protocol error({callback.Method}): Target closed.", + closeReason)); + } + + _callbacks.Clear(); + OnDisconnected(); + Connection = null; + } +} diff --git a/lib/PuppeteerSharp/Cdp/CdpDialog.cs b/lib/PuppeteerSharp/Cdp/CdpDialog.cs index 3335fff21..63c3bf640 100644 --- a/lib/PuppeteerSharp/Cdp/CdpDialog.cs +++ b/lib/PuppeteerSharp/Cdp/CdpDialog.cs @@ -21,7 +21,7 @@ // * SOFTWARE. using System.Threading.Tasks; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp.Cdp; diff --git a/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs b/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs index bb9274f78..ba6a09f36 100644 --- a/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs +++ b/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs @@ -25,7 +25,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.QueryHandlers; namespace PuppeteerSharp.Cdp; diff --git a/lib/PuppeteerSharp/Cdp/CdpHttpRequest.cs b/lib/PuppeteerSharp/Cdp/CdpHttpRequest.cs index 2f10e4131..47c7166c6 100644 --- a/lib/PuppeteerSharp/Cdp/CdpHttpRequest.cs +++ b/lib/PuppeteerSharp/Cdp/CdpHttpRequest.cs @@ -7,8 +7,8 @@ using System.Text; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using PuppeteerSharp.Messaging; -using PuppeteerSharp.Messaging.Protocol.Network; +using PuppeteerSharp.Cdp.Messaging; +using PuppeteerSharp.Cdp.Messaging.Protocol.Network; namespace PuppeteerSharp.Cdp; diff --git a/lib/PuppeteerSharp/Cdp/CdpHttpResponse.cs b/lib/PuppeteerSharp/Cdp/CdpHttpResponse.cs index 8e487ccc1..b484c5e7c 100644 --- a/lib/PuppeteerSharp/Cdp/CdpHttpResponse.cs +++ b/lib/PuppeteerSharp/Cdp/CdpHttpResponse.cs @@ -3,7 +3,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp.Cdp; diff --git a/lib/PuppeteerSharp/Cdp/CdpJSHandle.cs b/lib/PuppeteerSharp/Cdp/CdpJSHandle.cs index 1ea77d5dc..16b21234f 100644 --- a/lib/PuppeteerSharp/Cdp/CdpJSHandle.cs +++ b/lib/PuppeteerSharp/Cdp/CdpJSHandle.cs @@ -24,9 +24,9 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Newtonsoft.Json; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.Cdp; diff --git a/lib/PuppeteerSharp/Cdp/CdpWebWorker.cs b/lib/PuppeteerSharp/Cdp/CdpWebWorker.cs index 5e6c73037..569c96982 100644 --- a/lib/PuppeteerSharp/Cdp/CdpWebWorker.cs +++ b/lib/PuppeteerSharp/Cdp/CdpWebWorker.cs @@ -24,8 +24,8 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.Cdp; diff --git a/lib/PuppeteerSharp/Cdp/ChromeTargetManager.cs b/lib/PuppeteerSharp/Cdp/ChromeTargetManager.cs index 2c7a61d98..62d9a84b7 100644 --- a/lib/PuppeteerSharp/Cdp/ChromeTargetManager.cs +++ b/lib/PuppeteerSharp/Cdp/ChromeTargetManager.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.Cdp { diff --git a/lib/PuppeteerSharp/Cdp/FirefoxTargetManager.cs b/lib/PuppeteerSharp/Cdp/FirefoxTargetManager.cs index 410ec4d83..01d071cf7 100644 --- a/lib/PuppeteerSharp/Cdp/FirefoxTargetManager.cs +++ b/lib/PuppeteerSharp/Cdp/FirefoxTargetManager.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.Cdp { diff --git a/lib/PuppeteerSharp/Messaging/AccessibilityGetFullAXTreeResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/AccessibilityGetFullAXTreeResponse.cs similarity index 96% rename from lib/PuppeteerSharp/Messaging/AccessibilityGetFullAXTreeResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/AccessibilityGetFullAXTreeResponse.cs index fc724535b..4646743d7 100644 --- a/lib/PuppeteerSharp/Messaging/AccessibilityGetFullAXTreeResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/AccessibilityGetFullAXTreeResponse.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Newtonsoft.Json.Linq; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class AccessibilityGetFullAXTreeResponse { diff --git a/lib/PuppeteerSharp/Messaging/AccessibilityQueryAXTreeRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/AccessibilityQueryAXTreeRequest.cs similarity index 67% rename from lib/PuppeteerSharp/Messaging/AccessibilityQueryAXTreeRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/AccessibilityQueryAXTreeRequest.cs index 872ac93ca..43910f3aa 100644 --- a/lib/PuppeteerSharp/Messaging/AccessibilityQueryAXTreeRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/AccessibilityQueryAXTreeRequest.cs @@ -1,7 +1,4 @@ -using System.Collections.Generic; -using Newtonsoft.Json.Linq; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class AccessibilityQueryAXTreeRequest { diff --git a/lib/PuppeteerSharp/Cdp/Messaging/AccessibilityQueryAXTreeResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/AccessibilityQueryAXTreeResponse.cs new file mode 100644 index 000000000..ce6914643 --- /dev/null +++ b/lib/PuppeteerSharp/Cdp/Messaging/AccessibilityQueryAXTreeResponse.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using static PuppeteerSharp.Cdp.Messaging.AccessibilityGetFullAXTreeResponse; + +namespace PuppeteerSharp.Cdp.Messaging +{ + internal class AccessibilityQueryAXTreeResponse + { + public IEnumerable Nodes { get; set; } + } +} diff --git a/lib/PuppeteerSharp/Messaging/BasicFrameResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/BasicFrameResponse.cs similarity index 71% rename from lib/PuppeteerSharp/Messaging/BasicFrameResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/BasicFrameResponse.cs index 57a78dac3..4b13ea835 100644 --- a/lib/PuppeteerSharp/Messaging/BasicFrameResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/BasicFrameResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class BasicFrameResponse { diff --git a/lib/PuppeteerSharp/Messaging/BindingCalledResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/BindingCalledResponse.cs similarity index 96% rename from lib/PuppeteerSharp/Messaging/BindingCalledResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/BindingCalledResponse.cs index 3478161ba..38a9d389d 100644 --- a/lib/PuppeteerSharp/Messaging/BindingCalledResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/BindingCalledResponse.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json.Linq; using PuppeteerSharp.Helpers.Json; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class BindingCalledResponse { diff --git a/lib/PuppeteerSharp/Messaging/BrowserGetVersionResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/BrowserGetVersionResponse.cs similarity index 69% rename from lib/PuppeteerSharp/Messaging/BrowserGetVersionResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/BrowserGetVersionResponse.cs index 32ef4317d..ab171ceb3 100644 --- a/lib/PuppeteerSharp/Messaging/BrowserGetVersionResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/BrowserGetVersionResponse.cs @@ -1,6 +1,4 @@ -using System.Threading.Tasks; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class BrowserGetVersionResponse { diff --git a/lib/PuppeteerSharp/Messaging/BrowserGrantPermissionsRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/BrowserGrantPermissionsRequest.cs similarity index 76% rename from lib/PuppeteerSharp/Messaging/BrowserGrantPermissionsRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/BrowserGrantPermissionsRequest.cs index 94834a7a9..0ce8c7b02 100644 --- a/lib/PuppeteerSharp/Messaging/BrowserGrantPermissionsRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/BrowserGrantPermissionsRequest.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class BrowserGrantPermissionsRequest { diff --git a/lib/PuppeteerSharp/Messaging/BrowserResetPermissionsRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/BrowserResetPermissionsRequest.cs similarity index 75% rename from lib/PuppeteerSharp/Messaging/BrowserResetPermissionsRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/BrowserResetPermissionsRequest.cs index 3d0ab9b8e..a5ee4c5ed 100644 --- a/lib/PuppeteerSharp/Messaging/BrowserResetPermissionsRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/BrowserResetPermissionsRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class BrowserResetPermissionsRequest { diff --git a/lib/PuppeteerSharp/Messaging/CSSStopRuleUsageTrackingResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/CSSStopRuleUsageTrackingResponse.cs similarity index 91% rename from lib/PuppeteerSharp/Messaging/CSSStopRuleUsageTrackingResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/CSSStopRuleUsageTrackingResponse.cs index d014d3dce..8ff4bd413 100644 --- a/lib/PuppeteerSharp/Messaging/CSSStopRuleUsageTrackingResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/CSSStopRuleUsageTrackingResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class CSSStopRuleUsageTrackingResponse { diff --git a/lib/PuppeteerSharp/Messaging/CSSStyleSheetAddedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/CSSStyleSheetAddedResponse.cs similarity index 88% rename from lib/PuppeteerSharp/Messaging/CSSStyleSheetAddedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/CSSStyleSheetAddedResponse.cs index 2f3e7bd13..23a06ddfe 100644 --- a/lib/PuppeteerSharp/Messaging/CSSStyleSheetAddedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/CSSStyleSheetAddedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class CSSStyleSheetAddedResponse { diff --git a/lib/PuppeteerSharp/Messaging/CertificateErrorResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/CertificateErrorResponse.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/CertificateErrorResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/CertificateErrorResponse.cs index 6efaf9cfc..0c2171834 100644 --- a/lib/PuppeteerSharp/Messaging/CertificateErrorResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/CertificateErrorResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class CertificateErrorResponse { diff --git a/lib/PuppeteerSharp/Messaging/ConnectionError.cs b/lib/PuppeteerSharp/Cdp/Messaging/ConnectionError.cs similarity index 77% rename from lib/PuppeteerSharp/Messaging/ConnectionError.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ConnectionError.cs index 9a6389c58..fc53eeee7 100644 --- a/lib/PuppeteerSharp/Messaging/ConnectionError.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ConnectionError.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ConnectionError { diff --git a/lib/PuppeteerSharp/Messaging/ConnectionRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/ConnectionRequest.cs similarity index 85% rename from lib/PuppeteerSharp/Messaging/ConnectionRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ConnectionRequest.cs index 5e02546c1..b401cb6de 100644 --- a/lib/PuppeteerSharp/Messaging/ConnectionRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ConnectionRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ConnectionRequest { diff --git a/lib/PuppeteerSharp/Messaging/ConnectionResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/ConnectionResponse.cs similarity index 90% rename from lib/PuppeteerSharp/Messaging/ConnectionResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ConnectionResponse.cs index 2e7d675d5..a91915579 100644 --- a/lib/PuppeteerSharp/Messaging/ConnectionResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ConnectionResponse.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ConnectionResponse { diff --git a/lib/PuppeteerSharp/Messaging/ConnectionResponseParams.cs b/lib/PuppeteerSharp/Cdp/Messaging/ConnectionResponseParams.cs similarity index 86% rename from lib/PuppeteerSharp/Messaging/ConnectionResponseParams.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ConnectionResponseParams.cs index 9f6d3394c..b78952fd2 100644 --- a/lib/PuppeteerSharp/Messaging/ConnectionResponseParams.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ConnectionResponseParams.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ConnectionResponseParams { diff --git a/lib/PuppeteerSharp/Messaging/ContinueWithAuthRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/ContinueWithAuthRequest.cs similarity index 93% rename from lib/PuppeteerSharp/Messaging/ContinueWithAuthRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ContinueWithAuthRequest.cs index d051d6cb3..0157154ac 100644 --- a/lib/PuppeteerSharp/Messaging/ContinueWithAuthRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ContinueWithAuthRequest.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ContinueWithAuthRequest { diff --git a/lib/PuppeteerSharp/Messaging/ContinueWithAuthRequestChallengeResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/ContinueWithAuthRequestChallengeResponse.cs similarity index 84% rename from lib/PuppeteerSharp/Messaging/ContinueWithAuthRequestChallengeResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ContinueWithAuthRequestChallengeResponse.cs index 3e3f516ac..e6e592e3d 100644 --- a/lib/PuppeteerSharp/Messaging/ContinueWithAuthRequestChallengeResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ContinueWithAuthRequestChallengeResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ContinueWithAuthRequestChallengeResponse { diff --git a/lib/PuppeteerSharp/Messaging/CreateBrowserContextResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/CreateBrowserContextResponse.cs similarity index 75% rename from lib/PuppeteerSharp/Messaging/CreateBrowserContextResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/CreateBrowserContextResponse.cs index 464409abf..0c40f613b 100644 --- a/lib/PuppeteerSharp/Messaging/CreateBrowserContextResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/CreateBrowserContextResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class CreateBrowserContextResponse { diff --git a/lib/PuppeteerSharp/Messaging/CssGetStyleSheetTextRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/CssGetStyleSheetTextRequest.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/CssGetStyleSheetTextRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/CssGetStyleSheetTextRequest.cs index d5bd55ffb..a62ff7afb 100644 --- a/lib/PuppeteerSharp/Messaging/CssGetStyleSheetTextRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/CssGetStyleSheetTextRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class CssGetStyleSheetTextRequest { diff --git a/lib/PuppeteerSharp/Messaging/CssGetStyleSheetTextResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/CssGetStyleSheetTextResponse.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/CssGetStyleSheetTextResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/CssGetStyleSheetTextResponse.cs index fe2b2c205..b1dc0f843 100644 --- a/lib/PuppeteerSharp/Messaging/CssGetStyleSheetTextResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/CssGetStyleSheetTextResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class CssGetStyleSheetTextResponse { diff --git a/lib/PuppeteerSharp/Messaging/DebuggerGetScriptSourceRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/DebuggerGetScriptSourceRequest.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/DebuggerGetScriptSourceRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DebuggerGetScriptSourceRequest.cs index e65f5d795..1932d8948 100644 --- a/lib/PuppeteerSharp/Messaging/DebuggerGetScriptSourceRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DebuggerGetScriptSourceRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DebuggerGetScriptSourceRequest { diff --git a/lib/PuppeteerSharp/Messaging/DebuggerGetScriptSourceResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/DebuggerGetScriptSourceResponse.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/DebuggerGetScriptSourceResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DebuggerGetScriptSourceResponse.cs index d058f7220..e04c7b262 100644 --- a/lib/PuppeteerSharp/Messaging/DebuggerGetScriptSourceResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DebuggerGetScriptSourceResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DebuggerGetScriptSourceResponse { diff --git a/lib/PuppeteerSharp/Messaging/DebuggerScriptParsedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/DebuggerScriptParsedResponse.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/DebuggerScriptParsedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DebuggerScriptParsedResponse.cs index 1ae05c1e5..bf314ba54 100644 --- a/lib/PuppeteerSharp/Messaging/DebuggerScriptParsedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DebuggerScriptParsedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DebuggerScriptParsedResponse { diff --git a/lib/PuppeteerSharp/Messaging/DebuggerSetSkipAllPausesRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/DebuggerSetSkipAllPausesRequest.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/DebuggerSetSkipAllPausesRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DebuggerSetSkipAllPausesRequest.cs index 84619994e..ceb8d73da 100644 --- a/lib/PuppeteerSharp/Messaging/DebuggerSetSkipAllPausesRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DebuggerSetSkipAllPausesRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DebuggerSetSkipAllPausesRequest { diff --git a/lib/PuppeteerSharp/Messaging/DeviceAccessCancelPrompt.cs b/lib/PuppeteerSharp/Cdp/Messaging/DeviceAccessCancelPrompt.cs similarity index 96% rename from lib/PuppeteerSharp/Messaging/DeviceAccessCancelPrompt.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DeviceAccessCancelPrompt.cs index 47c33808a..9c4851e0c 100644 --- a/lib/PuppeteerSharp/Messaging/DeviceAccessCancelPrompt.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DeviceAccessCancelPrompt.cs @@ -20,7 +20,7 @@ // * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // * SOFTWARE. -namespace PuppeteerSharp.Messaging; +namespace PuppeteerSharp.Cdp.Messaging; internal class DeviceAccessCancelPrompt { diff --git a/lib/PuppeteerSharp/Messaging/DeviceAccessDeviceRequestPromptedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/DeviceAccessDeviceRequestPromptedResponse.cs similarity index 83% rename from lib/PuppeteerSharp/Messaging/DeviceAccessDeviceRequestPromptedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DeviceAccessDeviceRequestPromptedResponse.cs index 80d6387f5..5416faf8c 100644 --- a/lib/PuppeteerSharp/Messaging/DeviceAccessDeviceRequestPromptedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DeviceAccessDeviceRequestPromptedResponse.cs @@ -1,6 +1,4 @@ -using Newtonsoft.Json.Linq; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DeviceAccessDeviceRequestPromptedResponse { diff --git a/lib/PuppeteerSharp/Messaging/DeviceAccessSelectPrompt.cs b/lib/PuppeteerSharp/Cdp/Messaging/DeviceAccessSelectPrompt.cs similarity index 97% rename from lib/PuppeteerSharp/Messaging/DeviceAccessSelectPrompt.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DeviceAccessSelectPrompt.cs index 0ed02c522..c330f305f 100644 --- a/lib/PuppeteerSharp/Messaging/DeviceAccessSelectPrompt.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DeviceAccessSelectPrompt.cs @@ -20,7 +20,7 @@ // * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // * SOFTWARE. -namespace PuppeteerSharp.Messaging; +namespace PuppeteerSharp.Cdp.Messaging; internal class DeviceAccessSelectPrompt { diff --git a/lib/PuppeteerSharp/Messaging/DispatchKeyEventType.cs b/lib/PuppeteerSharp/Cdp/Messaging/DispatchKeyEventType.cs similarity index 93% rename from lib/PuppeteerSharp/Messaging/DispatchKeyEventType.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DispatchKeyEventType.cs index 0a74c6fef..6a9b27e46 100644 --- a/lib/PuppeteerSharp/Messaging/DispatchKeyEventType.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DispatchKeyEventType.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { [JsonConverter(typeof(StringEnumConverter))] internal enum DispatchKeyEventType diff --git a/lib/PuppeteerSharp/Messaging/DomDescribeNodeRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomDescribeNodeRequest.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/DomDescribeNodeRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomDescribeNodeRequest.cs index 86559f275..a692b7ddf 100644 --- a/lib/PuppeteerSharp/Messaging/DomDescribeNodeRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomDescribeNodeRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomDescribeNodeRequest { diff --git a/lib/PuppeteerSharp/Messaging/DomDescribeNodeResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomDescribeNodeResponse.cs similarity index 86% rename from lib/PuppeteerSharp/Messaging/DomDescribeNodeResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomDescribeNodeResponse.cs index 20598060a..6fb6923aa 100644 --- a/lib/PuppeteerSharp/Messaging/DomDescribeNodeResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomDescribeNodeResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomDescribeNodeResponse { diff --git a/lib/PuppeteerSharp/Messaging/DomGetBoxModelRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomGetBoxModelRequest.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/DomGetBoxModelRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomGetBoxModelRequest.cs index 312d6d486..b5593b92e 100644 --- a/lib/PuppeteerSharp/Messaging/DomGetBoxModelRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomGetBoxModelRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomGetBoxModelRequest { diff --git a/lib/PuppeteerSharp/Messaging/DomGetBoxModelResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomGetBoxModelResponse.cs similarity index 92% rename from lib/PuppeteerSharp/Messaging/DomGetBoxModelResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomGetBoxModelResponse.cs index 53b230ca4..22db9ab53 100644 --- a/lib/PuppeteerSharp/Messaging/DomGetBoxModelResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomGetBoxModelResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomGetBoxModelResponse { diff --git a/lib/PuppeteerSharp/Messaging/DomGetContentQuadsRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomGetContentQuadsRequest.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/DomGetContentQuadsRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomGetContentQuadsRequest.cs index e7ee38385..d5d80f44b 100644 --- a/lib/PuppeteerSharp/Messaging/DomGetContentQuadsRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomGetContentQuadsRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomGetContentQuadsRequest { diff --git a/lib/PuppeteerSharp/Messaging/DomGetFrameOwnerRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomGetFrameOwnerRequest.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/DomGetFrameOwnerRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomGetFrameOwnerRequest.cs index 856d9e8b2..ed0832d05 100644 --- a/lib/PuppeteerSharp/Messaging/DomGetFrameOwnerRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomGetFrameOwnerRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomGetFrameOwnerRequest { diff --git a/lib/PuppeteerSharp/Messaging/DomGetFrameOwnerResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomGetFrameOwnerResponse.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/DomGetFrameOwnerResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomGetFrameOwnerResponse.cs index f94acfb22..3fc9b0054 100644 --- a/lib/PuppeteerSharp/Messaging/DomGetFrameOwnerResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomGetFrameOwnerResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomGetFrameOwnerResponse { diff --git a/lib/PuppeteerSharp/Messaging/DomResolveNodeRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomResolveNodeRequest.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/DomResolveNodeRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomResolveNodeRequest.cs index 1edc49d9e..b1d91f383 100644 --- a/lib/PuppeteerSharp/Messaging/DomResolveNodeRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomResolveNodeRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomResolveNodeRequest { diff --git a/lib/PuppeteerSharp/Messaging/DomResolveNodeResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomResolveNodeResponse.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/DomResolveNodeResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomResolveNodeResponse.cs index 1406db572..86db8cafc 100644 --- a/lib/PuppeteerSharp/Messaging/DomResolveNodeResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomResolveNodeResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomResolveNodeResponse { diff --git a/lib/PuppeteerSharp/Messaging/DomScrollIntoViewIfNeededRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomScrollIntoViewIfNeededRequest.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/DomScrollIntoViewIfNeededRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomScrollIntoViewIfNeededRequest.cs index 8bfd80553..ed85dfcf2 100644 --- a/lib/PuppeteerSharp/Messaging/DomScrollIntoViewIfNeededRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomScrollIntoViewIfNeededRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomScrollIntoViewIfNeededRequest { diff --git a/lib/PuppeteerSharp/Messaging/DomSetFileInputFilesRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/DomSetFileInputFilesRequest.cs similarity index 83% rename from lib/PuppeteerSharp/Messaging/DomSetFileInputFilesRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DomSetFileInputFilesRequest.cs index c1130ea16..873497264 100644 --- a/lib/PuppeteerSharp/Messaging/DomSetFileInputFilesRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DomSetFileInputFilesRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class DomSetFileInputFilesRequest { diff --git a/lib/PuppeteerSharp/Messaging/DragEventType.cs b/lib/PuppeteerSharp/Cdp/Messaging/DragEventType.cs similarity index 93% rename from lib/PuppeteerSharp/Messaging/DragEventType.cs rename to lib/PuppeteerSharp/Cdp/Messaging/DragEventType.cs index 6af641aca..fae7b4dbe 100644 --- a/lib/PuppeteerSharp/Messaging/DragEventType.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/DragEventType.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { [JsonConverter(typeof(StringEnumConverter))] internal enum DragEventType diff --git a/lib/PuppeteerSharp/Messaging/EmulateTimezoneRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulateTimezoneRequest.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/EmulateTimezoneRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulateTimezoneRequest.cs index bbf7c9923..c659cdad4 100644 --- a/lib/PuppeteerSharp/Messaging/EmulateTimezoneRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulateTimezoneRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulateTimezoneRequest { diff --git a/lib/PuppeteerSharp/Messaging/EmulationSetCPUThrottlingRateRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetCPUThrottlingRateRequest.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/EmulationSetCPUThrottlingRateRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulationSetCPUThrottlingRateRequest.cs index 4d8e823e6..adbce71bf 100644 --- a/lib/PuppeteerSharp/Messaging/EmulationSetCPUThrottlingRateRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetCPUThrottlingRateRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulationSetCPUThrottlingRateRequest { diff --git a/lib/PuppeteerSharp/Messaging/EmulationSetDefaultBackgroundColorOverrideColor.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetDefaultBackgroundColorOverrideColor.cs similarity index 85% rename from lib/PuppeteerSharp/Messaging/EmulationSetDefaultBackgroundColorOverrideColor.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulationSetDefaultBackgroundColorOverrideColor.cs index dc865c6d0..7018f1ed4 100644 --- a/lib/PuppeteerSharp/Messaging/EmulationSetDefaultBackgroundColorOverrideColor.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetDefaultBackgroundColorOverrideColor.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulationSetDefaultBackgroundColorOverrideColor { diff --git a/lib/PuppeteerSharp/Messaging/EmulationSetDefaultBackgroundColorOverrideRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetDefaultBackgroundColorOverrideRequest.cs similarity index 81% rename from lib/PuppeteerSharp/Messaging/EmulationSetDefaultBackgroundColorOverrideRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulationSetDefaultBackgroundColorOverrideRequest.cs index 6c50f80c1..e89a656eb 100644 --- a/lib/PuppeteerSharp/Messaging/EmulationSetDefaultBackgroundColorOverrideRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetDefaultBackgroundColorOverrideRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulationSetDefaultBackgroundColorOverrideRequest { diff --git a/lib/PuppeteerSharp/Messaging/EmulationSetDeviceMetricsOverrideRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetDeviceMetricsOverrideRequest.cs similarity index 89% rename from lib/PuppeteerSharp/Messaging/EmulationSetDeviceMetricsOverrideRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulationSetDeviceMetricsOverrideRequest.cs index 7307955a3..cfb68e58a 100644 --- a/lib/PuppeteerSharp/Messaging/EmulationSetDeviceMetricsOverrideRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetDeviceMetricsOverrideRequest.cs @@ -1,6 +1,6 @@ using PuppeteerSharp.Media; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulationSetDeviceMetricsOverrideRequest { diff --git a/lib/PuppeteerSharp/Messaging/EmulationSetEmulatedMediaFeatureRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetEmulatedMediaFeatureRequest.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/EmulationSetEmulatedMediaFeatureRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulationSetEmulatedMediaFeatureRequest.cs index 658e08771..4246e759e 100644 --- a/lib/PuppeteerSharp/Messaging/EmulationSetEmulatedMediaFeatureRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetEmulatedMediaFeatureRequest.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; -using PuppeteerSharp.Media; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulationSetEmulatedMediaFeatureRequest { diff --git a/lib/PuppeteerSharp/Messaging/EmulationSetEmulatedMediaTypeRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetEmulatedMediaTypeRequest.cs similarity index 67% rename from lib/PuppeteerSharp/Messaging/EmulationSetEmulatedMediaTypeRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulationSetEmulatedMediaTypeRequest.cs index c9fe76dba..b9451ed0c 100644 --- a/lib/PuppeteerSharp/Messaging/EmulationSetEmulatedMediaTypeRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetEmulatedMediaTypeRequest.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; using PuppeteerSharp.Media; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulationSetEmulatedMediaTypeRequest { diff --git a/lib/PuppeteerSharp/Messaging/EmulationSetEmulatedVisionDeficiencyRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetEmulatedVisionDeficiencyRequest.cs similarity index 76% rename from lib/PuppeteerSharp/Messaging/EmulationSetEmulatedVisionDeficiencyRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulationSetEmulatedVisionDeficiencyRequest.cs index de0606c61..656540a7e 100644 --- a/lib/PuppeteerSharp/Messaging/EmulationSetEmulatedVisionDeficiencyRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetEmulatedVisionDeficiencyRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulationSetEmulatedVisionDeficiencyRequest { diff --git a/lib/PuppeteerSharp/Messaging/EmulationSetIdleOverrideRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetIdleOverrideRequest.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/EmulationSetIdleOverrideRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulationSetIdleOverrideRequest.cs index c33c6d62c..ee1673d29 100644 --- a/lib/PuppeteerSharp/Messaging/EmulationSetIdleOverrideRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetIdleOverrideRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulationSetIdleOverrideRequest { diff --git a/lib/PuppeteerSharp/Messaging/EmulationSetScriptExecutionDisabledRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetScriptExecutionDisabledRequest.cs similarity index 75% rename from lib/PuppeteerSharp/Messaging/EmulationSetScriptExecutionDisabledRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulationSetScriptExecutionDisabledRequest.cs index fee2ce4ee..2de606220 100644 --- a/lib/PuppeteerSharp/Messaging/EmulationSetScriptExecutionDisabledRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetScriptExecutionDisabledRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulationSetScriptExecutionDisabledRequest { diff --git a/lib/PuppeteerSharp/Messaging/EmulationSetTouchEmulationEnabledRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetTouchEmulationEnabledRequest.cs similarity index 81% rename from lib/PuppeteerSharp/Messaging/EmulationSetTouchEmulationEnabledRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EmulationSetTouchEmulationEnabledRequest.cs index e955effa3..e8b1a7e20 100644 --- a/lib/PuppeteerSharp/Messaging/EmulationSetTouchEmulationEnabledRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EmulationSetTouchEmulationEnabledRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EmulationSetTouchEmulationEnabledRequest { diff --git a/lib/PuppeteerSharp/Messaging/EvaluateExceptionResponseDetails.cs b/lib/PuppeteerSharp/Cdp/Messaging/EvaluateExceptionResponseDetails.cs similarity index 86% rename from lib/PuppeteerSharp/Messaging/EvaluateExceptionResponseDetails.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EvaluateExceptionResponseDetails.cs index ec9665b02..7f6364470 100644 --- a/lib/PuppeteerSharp/Messaging/EvaluateExceptionResponseDetails.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EvaluateExceptionResponseDetails.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EvaluateExceptionResponseDetails { diff --git a/lib/PuppeteerSharp/Messaging/EvaluateExceptionResponseInfo.cs b/lib/PuppeteerSharp/Cdp/Messaging/EvaluateExceptionResponseInfo.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/EvaluateExceptionResponseInfo.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EvaluateExceptionResponseInfo.cs index 2fc54a96b..d7a4cf6b4 100644 --- a/lib/PuppeteerSharp/Messaging/EvaluateExceptionResponseInfo.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EvaluateExceptionResponseInfo.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp +namespace PuppeteerSharp.Cdp.Messaging { internal class EvaluateExceptionResponseInfo { diff --git a/lib/PuppeteerSharp/Messaging/EvaluateExceptionResponseStackTrace.cs b/lib/PuppeteerSharp/Cdp/Messaging/EvaluateExceptionResponseStackTrace.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/EvaluateExceptionResponseStackTrace.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EvaluateExceptionResponseStackTrace.cs index 3efa9eea6..42d7ac403 100644 --- a/lib/PuppeteerSharp/Messaging/EvaluateExceptionResponseStackTrace.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EvaluateExceptionResponseStackTrace.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp +namespace PuppeteerSharp.Cdp.Messaging { internal class EvaluateExceptionResponseStackTrace { diff --git a/lib/PuppeteerSharp/Messaging/EvaluateHandleResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/EvaluateHandleResponse.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/EvaluateHandleResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EvaluateHandleResponse.cs index 9f62d5409..1132ad857 100644 --- a/lib/PuppeteerSharp/Messaging/EvaluateHandleResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EvaluateHandleResponse.cs @@ -1,6 +1,4 @@ -using Newtonsoft.Json.Linq; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class EvaluateHandleResponse { diff --git a/lib/PuppeteerSharp/Messaging/EvaluationExceptionResponseCallFrame.cs b/lib/PuppeteerSharp/Cdp/Messaging/EvaluationExceptionResponseCallFrame.cs similarity index 86% rename from lib/PuppeteerSharp/Messaging/EvaluationExceptionResponseCallFrame.cs rename to lib/PuppeteerSharp/Cdp/Messaging/EvaluationExceptionResponseCallFrame.cs index 975760ed1..893e37d62 100644 --- a/lib/PuppeteerSharp/Messaging/EvaluationExceptionResponseCallFrame.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/EvaluationExceptionResponseCallFrame.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp +namespace PuppeteerSharp.Cdp.Messaging { internal class EvaluationExceptionResponseCallFrame { diff --git a/lib/PuppeteerSharp/Messaging/FetchAuthRequiredResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/FetchAuthRequiredResponse.cs similarity index 95% rename from lib/PuppeteerSharp/Messaging/FetchAuthRequiredResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/FetchAuthRequiredResponse.cs index 7d529055c..d0ce03f4d 100644 --- a/lib/PuppeteerSharp/Messaging/FetchAuthRequiredResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/FetchAuthRequiredResponse.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Net; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class FetchAuthRequiredResponse { diff --git a/lib/PuppeteerSharp/Messaging/FetchContinueRequestRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/FetchContinueRequestRequest.cs similarity index 88% rename from lib/PuppeteerSharp/Messaging/FetchContinueRequestRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/FetchContinueRequestRequest.cs index c70313209..94ec82dee 100644 --- a/lib/PuppeteerSharp/Messaging/FetchContinueRequestRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/FetchContinueRequestRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class FetchContinueRequestRequest { diff --git a/lib/PuppeteerSharp/Messaging/FetchEnableRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/FetchEnableRequest.cs similarity index 88% rename from lib/PuppeteerSharp/Messaging/FetchEnableRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/FetchEnableRequest.cs index 5c276873d..59d014c14 100644 --- a/lib/PuppeteerSharp/Messaging/FetchEnableRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/FetchEnableRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class FetchEnableRequest { diff --git a/lib/PuppeteerSharp/Messaging/FetchFailRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/FetchFailRequest.cs similarity index 67% rename from lib/PuppeteerSharp/Messaging/FetchFailRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/FetchFailRequest.cs index 1603caed8..37dc5c843 100644 --- a/lib/PuppeteerSharp/Messaging/FetchFailRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/FetchFailRequest.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class FetchFailRequest { diff --git a/lib/PuppeteerSharp/Messaging/FetchFulfillRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/FetchFulfillRequest.cs similarity index 98% rename from lib/PuppeteerSharp/Messaging/FetchFulfillRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/FetchFulfillRequest.cs index d769c82c2..aaa61b82c 100644 --- a/lib/PuppeteerSharp/Messaging/FetchFulfillRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/FetchFulfillRequest.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class FetchFulfillRequest { diff --git a/lib/PuppeteerSharp/Messaging/FetchRequestPausedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/FetchRequestPausedResponse.cs similarity index 78% rename from lib/PuppeteerSharp/Messaging/FetchRequestPausedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/FetchRequestPausedResponse.cs index 30810a888..cbe8957f7 100644 --- a/lib/PuppeteerSharp/Messaging/FetchRequestPausedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/FetchRequestPausedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class FetchRequestPausedResponse : RequestWillBeSentPayload { diff --git a/lib/PuppeteerSharp/Messaging/FileChooserAction.cs b/lib/PuppeteerSharp/Cdp/Messaging/FileChooserAction.cs similarity index 93% rename from lib/PuppeteerSharp/Messaging/FileChooserAction.cs rename to lib/PuppeteerSharp/Cdp/Messaging/FileChooserAction.cs index f6df33454..b5c6b0310 100644 --- a/lib/PuppeteerSharp/Messaging/FileChooserAction.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/FileChooserAction.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { [JsonConverter(typeof(StringEnumConverter))] internal enum FileChooserAction diff --git a/lib/PuppeteerSharp/Messaging/GetBrowserContextsResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/GetBrowserContextsResponse.cs similarity index 75% rename from lib/PuppeteerSharp/Messaging/GetBrowserContextsResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/GetBrowserContextsResponse.cs index bb2de09aa..158dfca69 100644 --- a/lib/PuppeteerSharp/Messaging/GetBrowserContextsResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/GetBrowserContextsResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class GetBrowserContextsResponse { diff --git a/lib/PuppeteerSharp/Messaging/GetContentQuadsResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/GetContentQuadsResponse.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/GetContentQuadsResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/GetContentQuadsResponse.cs index 3286a87b0..4bb7c4114 100644 --- a/lib/PuppeteerSharp/Messaging/GetContentQuadsResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/GetContentQuadsResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class GetContentQuadsResponse { diff --git a/lib/PuppeteerSharp/Messaging/Header.cs b/lib/PuppeteerSharp/Cdp/Messaging/Header.cs similarity index 76% rename from lib/PuppeteerSharp/Messaging/Header.cs rename to lib/PuppeteerSharp/Cdp/Messaging/Header.cs index ec9c1d7c5..0a88d1013 100644 --- a/lib/PuppeteerSharp/Messaging/Header.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/Header.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class Header { diff --git a/lib/PuppeteerSharp/Messaging/IOCloseRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/IOCloseRequest.cs similarity index 70% rename from lib/PuppeteerSharp/Messaging/IOCloseRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/IOCloseRequest.cs index b0943c922..ed9ce492c 100644 --- a/lib/PuppeteerSharp/Messaging/IOCloseRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/IOCloseRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class IOCloseRequest { diff --git a/lib/PuppeteerSharp/Messaging/IOReadRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/IOReadRequest.cs similarity index 70% rename from lib/PuppeteerSharp/Messaging/IOReadRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/IOReadRequest.cs index d8178eaf8..0e63d0a9d 100644 --- a/lib/PuppeteerSharp/Messaging/IOReadRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/IOReadRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class IOReadRequest { diff --git a/lib/PuppeteerSharp/Messaging/IOReadResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/IOReadResponse.cs similarity index 82% rename from lib/PuppeteerSharp/Messaging/IOReadResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/IOReadResponse.cs index c1fdfdfb6..07686255c 100644 --- a/lib/PuppeteerSharp/Messaging/IOReadResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/IOReadResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class IOReadResponse { diff --git a/lib/PuppeteerSharp/Messaging/InputDispatchDragEventRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/InputDispatchDragEventRequest.cs similarity index 81% rename from lib/PuppeteerSharp/Messaging/InputDispatchDragEventRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/InputDispatchDragEventRequest.cs index 14027aef1..a341a9b3f 100644 --- a/lib/PuppeteerSharp/Messaging/InputDispatchDragEventRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/InputDispatchDragEventRequest.cs @@ -1,6 +1,4 @@ -using PuppeteerSharp.Input; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class InputDispatchDragEventRequest { diff --git a/lib/PuppeteerSharp/Messaging/InputDispatchKeyEventRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/InputDispatchKeyEventRequest.cs similarity index 93% rename from lib/PuppeteerSharp/Messaging/InputDispatchKeyEventRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/InputDispatchKeyEventRequest.cs index 64fa9f7e2..a5aa642d1 100644 --- a/lib/PuppeteerSharp/Messaging/InputDispatchKeyEventRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/InputDispatchKeyEventRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class InputDispatchKeyEventRequest { diff --git a/lib/PuppeteerSharp/Messaging/InputDispatchMouseEventRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/InputDispatchMouseEventRequest.cs similarity index 93% rename from lib/PuppeteerSharp/Messaging/InputDispatchMouseEventRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/InputDispatchMouseEventRequest.cs index 3cf0b798a..3670b22cf 100644 --- a/lib/PuppeteerSharp/Messaging/InputDispatchMouseEventRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/InputDispatchMouseEventRequest.cs @@ -1,6 +1,6 @@ using PuppeteerSharp.Input; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class InputDispatchMouseEventRequest { diff --git a/lib/PuppeteerSharp/Messaging/InputDispatchTouchEventRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/InputDispatchTouchEventRequest.cs similarity index 86% rename from lib/PuppeteerSharp/Messaging/InputDispatchTouchEventRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/InputDispatchTouchEventRequest.cs index 2edae1c4c..e485a4a46 100644 --- a/lib/PuppeteerSharp/Messaging/InputDispatchTouchEventRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/InputDispatchTouchEventRequest.cs @@ -1,6 +1,6 @@ using PuppeteerSharp.Input; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class InputDispatchTouchEventRequest { diff --git a/lib/PuppeteerSharp/Messaging/InputInsertTextRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/InputInsertTextRequest.cs similarity index 71% rename from lib/PuppeteerSharp/Messaging/InputInsertTextRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/InputInsertTextRequest.cs index 275818162..d0d0f5b5f 100644 --- a/lib/PuppeteerSharp/Messaging/InputInsertTextRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/InputInsertTextRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class InputInsertTextRequest { diff --git a/lib/PuppeteerSharp/Messaging/InputSetInterceptDragsRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/InputSetInterceptDragsRequest.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/InputSetInterceptDragsRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/InputSetInterceptDragsRequest.cs index 911269216..8851c0bb1 100644 --- a/lib/PuppeteerSharp/Messaging/InputSetInterceptDragsRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/InputSetInterceptDragsRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class InputSetInterceptDragsRequest { diff --git a/lib/PuppeteerSharp/Messaging/LifecycleEventResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/LifecycleEventResponse.cs similarity index 82% rename from lib/PuppeteerSharp/Messaging/LifecycleEventResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/LifecycleEventResponse.cs index 02201c83a..4341634ac 100644 --- a/lib/PuppeteerSharp/Messaging/LifecycleEventResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/LifecycleEventResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class LifecycleEventResponse { diff --git a/lib/PuppeteerSharp/Messaging/LoadingFailedEventResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/LoadingFailedEventResponse.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/LoadingFailedEventResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/LoadingFailedEventResponse.cs index 253268d31..96869f5cc 100644 --- a/lib/PuppeteerSharp/Messaging/LoadingFailedEventResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/LoadingFailedEventResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class LoadingFailedEventResponse { diff --git a/lib/PuppeteerSharp/Messaging/LoadingFinishedEventResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/LoadingFinishedEventResponse.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/LoadingFinishedEventResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/LoadingFinishedEventResponse.cs index e3599890f..2ce911967 100644 --- a/lib/PuppeteerSharp/Messaging/LoadingFinishedEventResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/LoadingFinishedEventResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class LoadingFinishedEventResponse { diff --git a/lib/PuppeteerSharp/Messaging/LogEntryAddedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/LogEntryAddedResponse.cs similarity index 87% rename from lib/PuppeteerSharp/Messaging/LogEntryAddedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/LogEntryAddedResponse.cs index a193a60a0..2b5208380 100644 --- a/lib/PuppeteerSharp/Messaging/LogEntryAddedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/LogEntryAddedResponse.cs @@ -1,6 +1,4 @@ -using Newtonsoft.Json.Linq; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class LogEntryAddedResponse { diff --git a/lib/PuppeteerSharp/Messaging/MouseEventType.cs b/lib/PuppeteerSharp/Cdp/Messaging/MouseEventType.cs similarity index 95% rename from lib/PuppeteerSharp/Messaging/MouseEventType.cs rename to lib/PuppeteerSharp/Cdp/Messaging/MouseEventType.cs index 887d3abd6..10bb4a05a 100644 --- a/lib/PuppeteerSharp/Messaging/MouseEventType.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/MouseEventType.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { [JsonConverter(typeof(StringEnumConverter))] internal enum MouseEventType diff --git a/lib/PuppeteerSharp/Messaging/NavigatedWithinDocumentResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/NavigatedWithinDocumentResponse.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/NavigatedWithinDocumentResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/NavigatedWithinDocumentResponse.cs index 0a19f0ab8..4403b11be 100644 --- a/lib/PuppeteerSharp/Messaging/NavigatedWithinDocumentResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/NavigatedWithinDocumentResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class NavigatedWithinDocumentResponse { diff --git a/lib/PuppeteerSharp/Messaging/NetworkEmulateNetworkConditionsRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/NetworkEmulateNetworkConditionsRequest.cs similarity index 87% rename from lib/PuppeteerSharp/Messaging/NetworkEmulateNetworkConditionsRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/NetworkEmulateNetworkConditionsRequest.cs index 9426e9a52..ac97fcc73 100644 --- a/lib/PuppeteerSharp/Messaging/NetworkEmulateNetworkConditionsRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/NetworkEmulateNetworkConditionsRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class NetworkEmulateNetworkConditionsRequest { diff --git a/lib/PuppeteerSharp/Messaging/NetworkGetCookiesRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/NetworkGetCookiesRequest.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/NetworkGetCookiesRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/NetworkGetCookiesRequest.cs index aab9df52c..75e255180 100644 --- a/lib/PuppeteerSharp/Messaging/NetworkGetCookiesRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/NetworkGetCookiesRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class NetworkGetCookiesRequest { diff --git a/lib/PuppeteerSharp/Messaging/NetworkGetCookiesResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/NetworkGetCookiesResponse.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/NetworkGetCookiesResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/NetworkGetCookiesResponse.cs index 557b0f6aa..63ccb487e 100644 --- a/lib/PuppeteerSharp/Messaging/NetworkGetCookiesResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/NetworkGetCookiesResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class NetworkGetCookiesResponse { diff --git a/lib/PuppeteerSharp/Messaging/NetworkGetResponseBodyRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/NetworkGetResponseBodyRequest.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/NetworkGetResponseBodyRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/NetworkGetResponseBodyRequest.cs index 518a181e3..369055f37 100644 --- a/lib/PuppeteerSharp/Messaging/NetworkGetResponseBodyRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/NetworkGetResponseBodyRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class NetworkGetResponseBodyRequest { diff --git a/lib/PuppeteerSharp/Messaging/NetworkGetResponseBodyResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/NetworkGetResponseBodyResponse.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/NetworkGetResponseBodyResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/NetworkGetResponseBodyResponse.cs index d53b51edd..ccf06c534 100644 --- a/lib/PuppeteerSharp/Messaging/NetworkGetResponseBodyResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/NetworkGetResponseBodyResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class NetworkGetResponseBodyResponse { diff --git a/lib/PuppeteerSharp/Messaging/NetworkSetCacheDisabledRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/NetworkSetCacheDisabledRequest.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/NetworkSetCacheDisabledRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/NetworkSetCacheDisabledRequest.cs index c791bdc3f..9193349be 100644 --- a/lib/PuppeteerSharp/Messaging/NetworkSetCacheDisabledRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/NetworkSetCacheDisabledRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class NetworkSetCacheDisabledRequest(bool cacheDisabled) { diff --git a/lib/PuppeteerSharp/Messaging/NetworkSetCookiesRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/NetworkSetCookiesRequest.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/NetworkSetCookiesRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/NetworkSetCookiesRequest.cs index 6a944a2dc..92c53ce72 100644 --- a/lib/PuppeteerSharp/Messaging/NetworkSetCookiesRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/NetworkSetCookiesRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class NetworkSetCookiesRequest { diff --git a/lib/PuppeteerSharp/Messaging/NetworkSetExtraHTTPHeadersRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/NetworkSetExtraHTTPHeadersRequest.cs similarity index 84% rename from lib/PuppeteerSharp/Messaging/NetworkSetExtraHTTPHeadersRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/NetworkSetExtraHTTPHeadersRequest.cs index d30bfcd59..4b10fbc97 100644 --- a/lib/PuppeteerSharp/Messaging/NetworkSetExtraHTTPHeadersRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/NetworkSetExtraHTTPHeadersRequest.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class NetworkSetExtraHTTPHeadersRequest(Dictionary headers) { diff --git a/lib/PuppeteerSharp/Messaging/NetworkSetUserAgentOverrideRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/NetworkSetUserAgentOverrideRequest.cs similarity index 82% rename from lib/PuppeteerSharp/Messaging/NetworkSetUserAgentOverrideRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/NetworkSetUserAgentOverrideRequest.cs index e184dea1d..aabd2b226 100644 --- a/lib/PuppeteerSharp/Messaging/NetworkSetUserAgentOverrideRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/NetworkSetUserAgentOverrideRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class NetworkSetUserAgentOverrideRequest { diff --git a/lib/PuppeteerSharp/Messaging/PageAddScriptToEvaluateOnNewDocumentRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageAddScriptToEvaluateOnNewDocumentRequest.cs similarity index 81% rename from lib/PuppeteerSharp/Messaging/PageAddScriptToEvaluateOnNewDocumentRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageAddScriptToEvaluateOnNewDocumentRequest.cs index b6f9e0a45..ab9ad87ff 100644 --- a/lib/PuppeteerSharp/Messaging/PageAddScriptToEvaluateOnNewDocumentRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageAddScriptToEvaluateOnNewDocumentRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageAddScriptToEvaluateOnNewDocumentRequest { diff --git a/lib/PuppeteerSharp/Messaging/PageAddScriptToEvaluateOnNewDocumentResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageAddScriptToEvaluateOnNewDocumentResponse.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/PageAddScriptToEvaluateOnNewDocumentResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageAddScriptToEvaluateOnNewDocumentResponse.cs index 73fd19afa..dd1d5fc90 100644 --- a/lib/PuppeteerSharp/Messaging/PageAddScriptToEvaluateOnNewDocumentResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageAddScriptToEvaluateOnNewDocumentResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging; +namespace PuppeteerSharp.Cdp.Messaging; internal class PageAddScriptToEvaluateOnNewDocumentResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageCaptureScreenshotRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageCaptureScreenshotRequest.cs similarity index 90% rename from lib/PuppeteerSharp/Messaging/PageCaptureScreenshotRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageCaptureScreenshotRequest.cs index 7602d0aeb..739e7987f 100644 --- a/lib/PuppeteerSharp/Messaging/PageCaptureScreenshotRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageCaptureScreenshotRequest.cs @@ -1,6 +1,6 @@ using PuppeteerSharp.Media; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageCaptureScreenshotRequest { diff --git a/lib/PuppeteerSharp/Messaging/PageCaptureScreenshotResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageCaptureScreenshotResponse.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/PageCaptureScreenshotResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageCaptureScreenshotResponse.cs index a1c6f75c3..1bb1f2671 100644 --- a/lib/PuppeteerSharp/Messaging/PageCaptureScreenshotResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageCaptureScreenshotResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageCaptureScreenshotResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageConsoleResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageConsoleResponse.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/PageConsoleResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageConsoleResponse.cs index f1a47cce5..d7f78c046 100644 --- a/lib/PuppeteerSharp/Messaging/PageConsoleResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageConsoleResponse.cs @@ -1,6 +1,4 @@ -using Newtonsoft.Json.Linq; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageConsoleResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageCreateIsolatedWorldRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageCreateIsolatedWorldRequest.cs similarity index 84% rename from lib/PuppeteerSharp/Messaging/PageCreateIsolatedWorldRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageCreateIsolatedWorldRequest.cs index 124ab8e0f..018c970fa 100644 --- a/lib/PuppeteerSharp/Messaging/PageCreateIsolatedWorldRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageCreateIsolatedWorldRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageCreateIsolatedWorldRequest { diff --git a/lib/PuppeteerSharp/Messaging/PageFileChooserOpenedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageFileChooserOpenedResponse.cs similarity index 83% rename from lib/PuppeteerSharp/Messaging/PageFileChooserOpenedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageFileChooserOpenedResponse.cs index fe17c21ea..e028d3ff4 100644 --- a/lib/PuppeteerSharp/Messaging/PageFileChooserOpenedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageFileChooserOpenedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageFileChooserOpenedResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageFrameAttachedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageFrameAttachedResponse.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/PageFrameAttachedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageFrameAttachedResponse.cs index 67707be5e..a3acc18c3 100644 --- a/lib/PuppeteerSharp/Messaging/PageFrameAttachedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageFrameAttachedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageFrameAttachedResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageFrameDetachedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageFrameDetachedResponse.cs similarity index 93% rename from lib/PuppeteerSharp/Messaging/PageFrameDetachedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageFrameDetachedResponse.cs index 2a4b4be8b..1d47a831e 100644 --- a/lib/PuppeteerSharp/Messaging/PageFrameDetachedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageFrameDetachedResponse.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using PuppeteerSharp.Helpers.Json; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { [JsonConverter(typeof(FlexibleStringEnumConverter), Unknown)] internal enum FrameDetachedReason diff --git a/lib/PuppeteerSharp/Messaging/PageFrameNavigatedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageFrameNavigatedResponse.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/PageFrameNavigatedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageFrameNavigatedResponse.cs index c547f85ae..f1dede88a 100644 --- a/lib/PuppeteerSharp/Messaging/PageFrameNavigatedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageFrameNavigatedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageFrameNavigatedResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageGetFrameTree.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageGetFrameTree.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/PageGetFrameTree.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageGetFrameTree.cs index b2a7efe86..d0643232d 100644 --- a/lib/PuppeteerSharp/Messaging/PageGetFrameTree.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageGetFrameTree.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageGetFrameTree { diff --git a/lib/PuppeteerSharp/Messaging/PageGetFrameTreeResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageGetFrameTreeResponse.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/PageGetFrameTreeResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageGetFrameTreeResponse.cs index 5b59094f4..7cd07fab3 100644 --- a/lib/PuppeteerSharp/Messaging/PageGetFrameTreeResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageGetFrameTreeResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageGetFrameTreeResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageGetLayoutMetricsResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageGetLayoutMetricsResponse.cs similarity index 95% rename from lib/PuppeteerSharp/Messaging/PageGetLayoutMetricsResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageGetLayoutMetricsResponse.cs index 799cb50d6..30b335f11 100644 --- a/lib/PuppeteerSharp/Messaging/PageGetLayoutMetricsResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageGetLayoutMetricsResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageGetLayoutMetricsResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageGetNavigationHistoryResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageGetNavigationHistoryResponse.cs similarity index 88% rename from lib/PuppeteerSharp/Messaging/PageGetNavigationHistoryResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageGetNavigationHistoryResponse.cs index 20e84d72c..28877fc00 100644 --- a/lib/PuppeteerSharp/Messaging/PageGetNavigationHistoryResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageGetNavigationHistoryResponse.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageGetNavigationHistoryResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageHandleFileChooserRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageHandleFileChooserRequest.cs similarity index 84% rename from lib/PuppeteerSharp/Messaging/PageHandleFileChooserRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageHandleFileChooserRequest.cs index 4b36a2698..c1a43bbd3 100644 --- a/lib/PuppeteerSharp/Messaging/PageHandleFileChooserRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageHandleFileChooserRequest.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageHandleFileChooserRequest { diff --git a/lib/PuppeteerSharp/Messaging/PageHandleJavaScriptDialogRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageHandleJavaScriptDialogRequest.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/PageHandleJavaScriptDialogRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageHandleJavaScriptDialogRequest.cs index a92e1220c..d3605839e 100644 --- a/lib/PuppeteerSharp/Messaging/PageHandleJavaScriptDialogRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageHandleJavaScriptDialogRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageHandleJavaScriptDialogRequest { diff --git a/lib/PuppeteerSharp/Messaging/PageJavascriptDialogOpeningResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageJavascriptDialogOpeningResponse.cs similarity index 86% rename from lib/PuppeteerSharp/Messaging/PageJavascriptDialogOpeningResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageJavascriptDialogOpeningResponse.cs index 5c82ecd19..4684f36c9 100644 --- a/lib/PuppeteerSharp/Messaging/PageJavascriptDialogOpeningResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageJavascriptDialogOpeningResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageJavascriptDialogOpeningResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageNavigateRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageNavigateRequest.cs similarity index 85% rename from lib/PuppeteerSharp/Messaging/PageNavigateRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageNavigateRequest.cs index 4ad6d304e..01fbca2d3 100644 --- a/lib/PuppeteerSharp/Messaging/PageNavigateRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageNavigateRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageNavigateRequest { diff --git a/lib/PuppeteerSharp/Messaging/PageNavigateResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageNavigateResponse.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/PageNavigateResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageNavigateResponse.cs index b06856b05..fd440bd3d 100644 --- a/lib/PuppeteerSharp/Messaging/PageNavigateResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageNavigateResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageNavigateResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageNavigateToHistoryEntryRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageNavigateToHistoryEntryRequest.cs similarity index 75% rename from lib/PuppeteerSharp/Messaging/PageNavigateToHistoryEntryRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageNavigateToHistoryEntryRequest.cs index a4fc49ae9..83bf95179 100644 --- a/lib/PuppeteerSharp/Messaging/PageNavigateToHistoryEntryRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageNavigateToHistoryEntryRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageNavigateToHistoryEntryRequest { diff --git a/lib/PuppeteerSharp/Messaging/PagePrintToPDFRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PagePrintToPDFRequest.cs similarity index 95% rename from lib/PuppeteerSharp/Messaging/PagePrintToPDFRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PagePrintToPDFRequest.cs index a1219578e..921026682 100644 --- a/lib/PuppeteerSharp/Messaging/PagePrintToPDFRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PagePrintToPDFRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PagePrintToPDFRequest { diff --git a/lib/PuppeteerSharp/Messaging/PagePrintToPDFResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PagePrintToPDFResponse.cs similarity index 78% rename from lib/PuppeteerSharp/Messaging/PagePrintToPDFResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PagePrintToPDFResponse.cs index d1657cad7..5e32edaa8 100644 --- a/lib/PuppeteerSharp/Messaging/PagePrintToPDFResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PagePrintToPDFResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PagePrintToPDFResponse { diff --git a/lib/PuppeteerSharp/Messaging/PageReloadRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageReloadRequest.cs similarity index 71% rename from lib/PuppeteerSharp/Messaging/PageReloadRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageReloadRequest.cs index b33f18dcd..e81f6553d 100644 --- a/lib/PuppeteerSharp/Messaging/PageReloadRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageReloadRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageReloadRequest { diff --git a/lib/PuppeteerSharp/Messaging/PageRemoveScriptToEvaluateOnNewDocumentRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageRemoveScriptToEvaluateOnNewDocumentRequest.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/PageRemoveScriptToEvaluateOnNewDocumentRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageRemoveScriptToEvaluateOnNewDocumentRequest.cs index 85ec701fe..ed74626c6 100644 --- a/lib/PuppeteerSharp/Messaging/PageRemoveScriptToEvaluateOnNewDocumentRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageRemoveScriptToEvaluateOnNewDocumentRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging; +namespace PuppeteerSharp.Cdp.Messaging; internal class PageRemoveScriptToEvaluateOnNewDocumentRequest { diff --git a/lib/PuppeteerSharp/Messaging/PageSetBypassCSPRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageSetBypassCSPRequest.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/PageSetBypassCSPRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageSetBypassCSPRequest.cs index a97772671..b0a027406 100644 --- a/lib/PuppeteerSharp/Messaging/PageSetBypassCSPRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageSetBypassCSPRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageSetBypassCSPRequest { diff --git a/lib/PuppeteerSharp/Messaging/PageSetInterceptFileChooserDialog.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageSetInterceptFileChooserDialog.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/PageSetInterceptFileChooserDialog.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageSetInterceptFileChooserDialog.cs index c3c937f17..fd25df97c 100644 --- a/lib/PuppeteerSharp/Messaging/PageSetInterceptFileChooserDialog.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageSetInterceptFileChooserDialog.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageSetInterceptFileChooserDialog { diff --git a/lib/PuppeteerSharp/Messaging/PageSetLifecycleEventsEnabledRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageSetLifecycleEventsEnabledRequest.cs similarity index 75% rename from lib/PuppeteerSharp/Messaging/PageSetLifecycleEventsEnabledRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PageSetLifecycleEventsEnabledRequest.cs index ba64aab9b..4d6173f75 100644 --- a/lib/PuppeteerSharp/Messaging/PageSetLifecycleEventsEnabledRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PageSetLifecycleEventsEnabledRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PageSetLifecycleEventsEnabledRequest { diff --git a/lib/PuppeteerSharp/Messaging/PerformanceGetMetricsResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PerformanceGetMetricsResponse.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/PerformanceGetMetricsResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PerformanceGetMetricsResponse.cs index acd6a7119..2e8de0b06 100644 --- a/lib/PuppeteerSharp/Messaging/PerformanceGetMetricsResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PerformanceGetMetricsResponse.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PerformanceGetMetricsResponse { diff --git a/lib/PuppeteerSharp/Messaging/PerformanceMetricsResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PerformanceMetricsResponse.cs similarity index 82% rename from lib/PuppeteerSharp/Messaging/PerformanceMetricsResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/PerformanceMetricsResponse.cs index 0dce9b8b3..90d9e7e52 100644 --- a/lib/PuppeteerSharp/Messaging/PerformanceMetricsResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/PerformanceMetricsResponse.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class PerformanceMetricsResponse { diff --git a/lib/PuppeteerSharp/Messaging/ProfilerStartPreciseCoverageRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/ProfilerStartPreciseCoverageRequest.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/ProfilerStartPreciseCoverageRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ProfilerStartPreciseCoverageRequest.cs index 534b27ecf..e5f55479b 100644 --- a/lib/PuppeteerSharp/Messaging/ProfilerStartPreciseCoverageRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ProfilerStartPreciseCoverageRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ProfilerStartPreciseCoverageRequest { diff --git a/lib/PuppeteerSharp/Messaging/ProfilerTakePreciseCoverageResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/ProfilerTakePreciseCoverageResponse.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/ProfilerTakePreciseCoverageResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ProfilerTakePreciseCoverageResponse.cs index 5dce27902..887e4ab2e 100644 --- a/lib/PuppeteerSharp/Messaging/ProfilerTakePreciseCoverageResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ProfilerTakePreciseCoverageResponse.cs @@ -1,6 +1,6 @@ using PuppeteerSharp.PageCoverage; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ProfilerTakePreciseCoverageResponse { diff --git a/lib/PuppeteerSharp/Messaging/Protocol/Network/GetRequestPostDataRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/Protocol/Network/GetRequestPostDataRequest.cs similarity index 95% rename from lib/PuppeteerSharp/Messaging/Protocol/Network/GetRequestPostDataRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/Protocol/Network/GetRequestPostDataRequest.cs index 8797162cb..4cd247622 100644 --- a/lib/PuppeteerSharp/Messaging/Protocol/Network/GetRequestPostDataRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/Protocol/Network/GetRequestPostDataRequest.cs @@ -20,7 +20,7 @@ // * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // * SOFTWARE. -namespace PuppeteerSharp.Messaging.Protocol.Network; +namespace PuppeteerSharp.Cdp.Messaging.Protocol.Network; internal class GetRequestPostDataRequest(string requestId) { diff --git a/lib/PuppeteerSharp/Messaging/Protocol/Network/GetRequestPostDataResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/Protocol/Network/GetRequestPostDataResponse.cs similarity index 95% rename from lib/PuppeteerSharp/Messaging/Protocol/Network/GetRequestPostDataResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/Protocol/Network/GetRequestPostDataResponse.cs index b818751c6..50e515366 100644 --- a/lib/PuppeteerSharp/Messaging/Protocol/Network/GetRequestPostDataResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/Protocol/Network/GetRequestPostDataResponse.cs @@ -20,7 +20,7 @@ // * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // * SOFTWARE. -namespace PuppeteerSharp.Messaging.Protocol.Network; +namespace PuppeteerSharp.Cdp.Messaging.Protocol.Network; internal class GetRequestPostDataResponse { diff --git a/lib/PuppeteerSharp/Messaging/RemoteObject.cs b/lib/PuppeteerSharp/Cdp/Messaging/RemoteObject.cs similarity index 96% rename from lib/PuppeteerSharp/Messaging/RemoteObject.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RemoteObject.cs index 151bc2c8c..44b76b4b4 100644 --- a/lib/PuppeteerSharp/Messaging/RemoteObject.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RemoteObject.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { /// /// Remote object is a mirror object referencing original JavaScript object. diff --git a/lib/PuppeteerSharp/Messaging/RemoteObjectSubtype.cs b/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectSubtype.cs similarity index 97% rename from lib/PuppeteerSharp/Messaging/RemoteObjectSubtype.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectSubtype.cs index 4ab90841a..5d9138106 100644 --- a/lib/PuppeteerSharp/Messaging/RemoteObjectSubtype.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectSubtype.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using PuppeteerSharp.Helpers.Json; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { /// /// Remote object subtype. diff --git a/lib/PuppeteerSharp/Messaging/RemoteObjectType.cs b/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectType.cs similarity index 96% rename from lib/PuppeteerSharp/Messaging/RemoteObjectType.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectType.cs index 328564050..e38e50e6d 100644 --- a/lib/PuppeteerSharp/Messaging/RemoteObjectType.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectType.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using PuppeteerSharp.Helpers.Json; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { /// /// Remote object type. diff --git a/lib/PuppeteerSharp/Messaging/RequestServedFromCacheResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/RequestServedFromCacheResponse.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/RequestServedFromCacheResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RequestServedFromCacheResponse.cs index 099a4576a..43fb0111b 100644 --- a/lib/PuppeteerSharp/Messaging/RequestServedFromCacheResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RequestServedFromCacheResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RequestServedFromCacheResponse { diff --git a/lib/PuppeteerSharp/Messaging/RequestWillBeSentPayload.cs b/lib/PuppeteerSharp/Cdp/Messaging/RequestWillBeSentPayload.cs similarity index 85% rename from lib/PuppeteerSharp/Messaging/RequestWillBeSentPayload.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RequestWillBeSentPayload.cs index bda8f5915..ab54b64bd 100644 --- a/lib/PuppeteerSharp/Messaging/RequestWillBeSentPayload.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RequestWillBeSentPayload.cs @@ -1,6 +1,4 @@ -using PuppeteerSharp.Messaging.Protocol.Network; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RequestWillBeSentPayload { diff --git a/lib/PuppeteerSharp/Messaging/ResponsePayload.cs b/lib/PuppeteerSharp/Cdp/Messaging/ResponsePayload.cs similarity index 94% rename from lib/PuppeteerSharp/Messaging/ResponsePayload.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ResponsePayload.cs index 75c5c25bd..864f3110c 100644 --- a/lib/PuppeteerSharp/Messaging/ResponsePayload.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ResponsePayload.cs @@ -2,7 +2,7 @@ using System.Net; using Newtonsoft.Json; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ResponsePayload { diff --git a/lib/PuppeteerSharp/Messaging/ResponseReceivedExtraInfoResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/ResponseReceivedExtraInfoResponse.cs similarity index 89% rename from lib/PuppeteerSharp/Messaging/ResponseReceivedExtraInfoResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ResponseReceivedExtraInfoResponse.cs index 8811c06ea..e3b015234 100644 --- a/lib/PuppeteerSharp/Messaging/ResponseReceivedExtraInfoResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ResponseReceivedExtraInfoResponse.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Net; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ResponseReceivedExtraInfoResponse { diff --git a/lib/PuppeteerSharp/Messaging/ResponseReceivedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/ResponseReceivedResponse.cs similarity index 84% rename from lib/PuppeteerSharp/Messaging/ResponseReceivedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/ResponseReceivedResponse.cs index 3c2dbf5cf..41b231ce9 100644 --- a/lib/PuppeteerSharp/Messaging/ResponseReceivedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/ResponseReceivedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class ResponseReceivedResponse { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeAddBindingRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeAddBindingRequest.cs similarity index 84% rename from lib/PuppeteerSharp/Messaging/RuntimeAddBindingRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeAddBindingRequest.cs index fa8eebd69..7767c560c 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeAddBindingRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeAddBindingRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeAddBindingRequest { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeCallFunctionOnRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeCallFunctionOnRequest.cs similarity index 92% rename from lib/PuppeteerSharp/Messaging/RuntimeCallFunctionOnRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeCallFunctionOnRequest.cs index cdce47860..c9ce49ce5 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeCallFunctionOnRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeCallFunctionOnRequest.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeCallFunctionOnRequest { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeCallFunctionOnRequestArgument.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeCallFunctionOnRequestArgument.cs similarity index 84% rename from lib/PuppeteerSharp/Messaging/RuntimeCallFunctionOnRequestArgument.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeCallFunctionOnRequestArgument.cs index b9a335e43..9bd409057 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeCallFunctionOnRequestArgument.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeCallFunctionOnRequestArgument.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeCallFunctionOnRequestArgument { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeCallFunctionOnResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeCallFunctionOnResponse.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/RuntimeCallFunctionOnResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeCallFunctionOnResponse.cs index 0ab7611f2..8133d7267 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeCallFunctionOnResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeCallFunctionOnResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeCallFunctionOnResponse { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeEvaluateRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeEvaluateRequest.cs similarity index 83% rename from lib/PuppeteerSharp/Messaging/RuntimeEvaluateRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeEvaluateRequest.cs index 05da3c4f2..397629b9d 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeEvaluateRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeEvaluateRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeEvaluateRequest { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeExceptionThrownResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeExceptionThrownResponse.cs similarity index 78% rename from lib/PuppeteerSharp/Messaging/RuntimeExceptionThrownResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeExceptionThrownResponse.cs index 5367babd9..0c66797dc 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeExceptionThrownResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeExceptionThrownResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeExceptionThrownResponse { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeExecutionContextCreatedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeExecutionContextCreatedResponse.cs similarity index 76% rename from lib/PuppeteerSharp/Messaging/RuntimeExecutionContextCreatedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeExecutionContextCreatedResponse.cs index eedbdb6cd..ae21cd12a 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeExecutionContextCreatedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeExecutionContextCreatedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeExecutionContextCreatedResponse { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeExecutionContextDestroyedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeExecutionContextDestroyedResponse.cs similarity index 76% rename from lib/PuppeteerSharp/Messaging/RuntimeExecutionContextDestroyedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeExecutionContextDestroyedResponse.cs index 8ef259751..04ea19df6 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeExecutionContextDestroyedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeExecutionContextDestroyedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeExecutionContextDestroyedResponse { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeGetPropertiesRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeGetPropertiesRequest.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/RuntimeGetPropertiesRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeGetPropertiesRequest.cs index da52f7513..fc58e32c9 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeGetPropertiesRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeGetPropertiesRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeGetPropertiesRequest { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeGetPropertiesResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeGetPropertiesResponse.cs similarity index 91% rename from lib/PuppeteerSharp/Messaging/RuntimeGetPropertiesResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeGetPropertiesResponse.cs index 65f4a2cd2..f870530c2 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeGetPropertiesResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeGetPropertiesResponse.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeGetPropertiesResponse { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeQueryObjectsRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeQueryObjectsRequest.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/RuntimeQueryObjectsRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeQueryObjectsRequest.cs index 016fb08b6..b733e1eb4 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeQueryObjectsRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeQueryObjectsRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeQueryObjectsRequest { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeQueryObjectsResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeQueryObjectsResponse.cs similarity index 63% rename from lib/PuppeteerSharp/Messaging/RuntimeQueryObjectsResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeQueryObjectsResponse.cs index baaa0caf2..a9aa0c192 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeQueryObjectsResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeQueryObjectsResponse.cs @@ -1,6 +1,4 @@ -using Newtonsoft.Json.Linq; - -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeQueryObjectsResponse { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeReleaseObjectRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeReleaseObjectRequest.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/RuntimeReleaseObjectRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeReleaseObjectRequest.cs index 99e8ca871..a435cf8ca 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeReleaseObjectRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeReleaseObjectRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class RuntimeReleaseObjectRequest { diff --git a/lib/PuppeteerSharp/Messaging/RuntimeRemoveBindingRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeRemoveBindingRequest.cs similarity index 68% rename from lib/PuppeteerSharp/Messaging/RuntimeRemoveBindingRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/RuntimeRemoveBindingRequest.cs index a5088d23f..046c066c2 100644 --- a/lib/PuppeteerSharp/Messaging/RuntimeRemoveBindingRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/RuntimeRemoveBindingRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging; +namespace PuppeteerSharp.Cdp.Messaging; internal class RuntimeRemoveBindingRequest { diff --git a/lib/PuppeteerSharp/Messaging/SecurityHandleCertificateErrorResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/SecurityHandleCertificateErrorResponse.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/SecurityHandleCertificateErrorResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/SecurityHandleCertificateErrorResponse.cs index bf2e41a75..8f8172a2b 100644 --- a/lib/PuppeteerSharp/Messaging/SecurityHandleCertificateErrorResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/SecurityHandleCertificateErrorResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class SecurityHandleCertificateErrorResponse { diff --git a/lib/PuppeteerSharp/Messaging/SecuritySetIgnoreCertificateErrorsRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/SecuritySetIgnoreCertificateErrorsRequest.cs similarity index 75% rename from lib/PuppeteerSharp/Messaging/SecuritySetIgnoreCertificateErrorsRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/SecuritySetIgnoreCertificateErrorsRequest.cs index 733e54ecf..aa9ca31cf 100644 --- a/lib/PuppeteerSharp/Messaging/SecuritySetIgnoreCertificateErrorsRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/SecuritySetIgnoreCertificateErrorsRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class SecuritySetIgnoreCertificateErrorsRequest { diff --git a/lib/PuppeteerSharp/Messaging/SecuritySetOverrideCertificateErrorsRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/SecuritySetOverrideCertificateErrorsRequest.cs similarity index 75% rename from lib/PuppeteerSharp/Messaging/SecuritySetOverrideCertificateErrorsRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/SecuritySetOverrideCertificateErrorsRequest.cs index a52aaa0c1..bed07914a 100644 --- a/lib/PuppeteerSharp/Messaging/SecuritySetOverrideCertificateErrorsRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/SecuritySetOverrideCertificateErrorsRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class SecuritySetOverrideCertificateErrorsRequest { diff --git a/lib/PuppeteerSharp/Messaging/StackTrace.cs b/lib/PuppeteerSharp/Cdp/Messaging/StackTrace.cs similarity index 86% rename from lib/PuppeteerSharp/Messaging/StackTrace.cs rename to lib/PuppeteerSharp/Cdp/Messaging/StackTrace.cs index 7692341b0..6dfa57637 100644 --- a/lib/PuppeteerSharp/Messaging/StackTrace.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/StackTrace.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class StackTrace { diff --git a/lib/PuppeteerSharp/Messaging/StackTraceId.cs b/lib/PuppeteerSharp/Cdp/Messaging/StackTraceId.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/StackTraceId.cs rename to lib/PuppeteerSharp/Cdp/Messaging/StackTraceId.cs index 82e0e38d9..d8aba4d0b 100644 --- a/lib/PuppeteerSharp/Messaging/StackTraceId.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/StackTraceId.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging; +namespace PuppeteerSharp.Cdp.Messaging; internal class StackTraceId { diff --git a/lib/PuppeteerSharp/Messaging/TargetActivateTargetRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetActivateTargetRequest.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/TargetActivateTargetRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetActivateTargetRequest.cs index b95167c40..d0b6f7100 100644 --- a/lib/PuppeteerSharp/Messaging/TargetActivateTargetRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetActivateTargetRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetActivateTargetRequest { diff --git a/lib/PuppeteerSharp/Messaging/TargetAttachToTargetRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetAttachToTargetRequest.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/TargetAttachToTargetRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetAttachToTargetRequest.cs index 81e72f7ae..25be26da9 100644 --- a/lib/PuppeteerSharp/Messaging/TargetAttachToTargetRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetAttachToTargetRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetAttachToTargetRequest { diff --git a/lib/PuppeteerSharp/Messaging/TargetAttachToTargetResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetAttachToTargetResponse.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/TargetAttachToTargetResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetAttachToTargetResponse.cs index bcbbd98fe..cf361627f 100644 --- a/lib/PuppeteerSharp/Messaging/TargetAttachToTargetResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetAttachToTargetResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetAttachToTargetResponse { diff --git a/lib/PuppeteerSharp/Messaging/TargetAttachedToTargetResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetAttachedToTargetResponse.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/TargetAttachedToTargetResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetAttachedToTargetResponse.cs index 020a6dda8..c4367fd9e 100644 --- a/lib/PuppeteerSharp/Messaging/TargetAttachedToTargetResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetAttachedToTargetResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetAttachedToTargetResponse { diff --git a/lib/PuppeteerSharp/Messaging/TargetCloseTargetRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetCloseTargetRequest.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/TargetCloseTargetRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetCloseTargetRequest.cs index 29a5b0659..621edf3f4 100644 --- a/lib/PuppeteerSharp/Messaging/TargetCloseTargetRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetCloseTargetRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetCloseTargetRequest { diff --git a/lib/PuppeteerSharp/Messaging/TargetCreateBrowserContextRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetCreateBrowserContextRequest.cs similarity index 81% rename from lib/PuppeteerSharp/Messaging/TargetCreateBrowserContextRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetCreateBrowserContextRequest.cs index d30cd0a17..12247a853 100644 --- a/lib/PuppeteerSharp/Messaging/TargetCreateBrowserContextRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetCreateBrowserContextRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetCreateBrowserContextRequest { diff --git a/lib/PuppeteerSharp/Messaging/TargetCreateTargetRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetCreateTargetRequest.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/TargetCreateTargetRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetCreateTargetRequest.cs index df1c4e4b7..17580bb93 100644 --- a/lib/PuppeteerSharp/Messaging/TargetCreateTargetRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetCreateTargetRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetCreateTargetRequest { diff --git a/lib/PuppeteerSharp/Messaging/TargetCreateTargetResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetCreateTargetResponse.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/TargetCreateTargetResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetCreateTargetResponse.cs index 318ac4f8d..ddd1ae96d 100644 --- a/lib/PuppeteerSharp/Messaging/TargetCreateTargetResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetCreateTargetResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetCreateTargetResponse { diff --git a/lib/PuppeteerSharp/Messaging/TargetCreatedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetCreatedResponse.cs similarity index 73% rename from lib/PuppeteerSharp/Messaging/TargetCreatedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetCreatedResponse.cs index b347b1c9a..566264e1c 100644 --- a/lib/PuppeteerSharp/Messaging/TargetCreatedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetCreatedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetCreatedResponse { diff --git a/lib/PuppeteerSharp/Messaging/TargetDestroyedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetDestroyedResponse.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/TargetDestroyedResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetDestroyedResponse.cs index f04a81cf7..9e990aee5 100644 --- a/lib/PuppeteerSharp/Messaging/TargetDestroyedResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetDestroyedResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetDestroyedResponse { diff --git a/lib/PuppeteerSharp/Messaging/TargetDetachFromTargetRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetDetachFromTargetRequest.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/TargetDetachFromTargetRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetDetachFromTargetRequest.cs index b3e88f174..fb30ee89d 100644 --- a/lib/PuppeteerSharp/Messaging/TargetDetachFromTargetRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetDetachFromTargetRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetDetachFromTargetRequest { diff --git a/lib/PuppeteerSharp/Messaging/TargetDetachedFromTargetResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetDetachedFromTargetResponse.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/TargetDetachedFromTargetResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetDetachedFromTargetResponse.cs index c36965bc3..5abd964ce 100644 --- a/lib/PuppeteerSharp/Messaging/TargetDetachedFromTargetResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetDetachedFromTargetResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetDetachedFromTargetResponse { diff --git a/lib/PuppeteerSharp/Messaging/TargetDisposeBrowserContextRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetDisposeBrowserContextRequest.cs similarity index 75% rename from lib/PuppeteerSharp/Messaging/TargetDisposeBrowserContextRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetDisposeBrowserContextRequest.cs index 1c61c8909..28f8c6dfa 100644 --- a/lib/PuppeteerSharp/Messaging/TargetDisposeBrowserContextRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetDisposeBrowserContextRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetDisposeBrowserContextRequest { diff --git a/lib/PuppeteerSharp/Messaging/TargetSendMessageToTargetRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetSendMessageToTargetRequest.cs similarity index 80% rename from lib/PuppeteerSharp/Messaging/TargetSendMessageToTargetRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetSendMessageToTargetRequest.cs index 75f0cba90..716183d96 100644 --- a/lib/PuppeteerSharp/Messaging/TargetSendMessageToTargetRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetSendMessageToTargetRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetSendMessageToTargetRequest { diff --git a/lib/PuppeteerSharp/Messaging/TargetSetAutoAttachRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetSetAutoAttachRequest.cs similarity index 84% rename from lib/PuppeteerSharp/Messaging/TargetSetAutoAttachRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetSetAutoAttachRequest.cs index f44292d2b..e6723f897 100644 --- a/lib/PuppeteerSharp/Messaging/TargetSetAutoAttachRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetSetAutoAttachRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetSetAutoAttachRequest { diff --git a/lib/PuppeteerSharp/Messaging/TargetSetDiscoverTargetsRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TargetSetDiscoverTargetsRequest.cs similarity index 92% rename from lib/PuppeteerSharp/Messaging/TargetSetDiscoverTargetsRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TargetSetDiscoverTargetsRequest.cs index d42c46233..3b918445f 100644 --- a/lib/PuppeteerSharp/Messaging/TargetSetDiscoverTargetsRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TargetSetDiscoverTargetsRequest.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TargetSetDiscoverTargetsRequest { diff --git a/lib/PuppeteerSharp/Messaging/TracingCompleteResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/TracingCompleteResponse.cs similarity index 72% rename from lib/PuppeteerSharp/Messaging/TracingCompleteResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TracingCompleteResponse.cs index fe96af338..e05df188b 100644 --- a/lib/PuppeteerSharp/Messaging/TracingCompleteResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TracingCompleteResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TracingCompleteResponse { diff --git a/lib/PuppeteerSharp/Messaging/TracingStartRequest.cs b/lib/PuppeteerSharp/Cdp/Messaging/TracingStartRequest.cs similarity index 79% rename from lib/PuppeteerSharp/Messaging/TracingStartRequest.cs rename to lib/PuppeteerSharp/Cdp/Messaging/TracingStartRequest.cs index fed047577..480f93e22 100644 --- a/lib/PuppeteerSharp/Messaging/TracingStartRequest.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/TracingStartRequest.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class TracingStartRequest { diff --git a/lib/PuppeteerSharp/Messaging/WSEndpointResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/WSEndpointResponse.cs similarity index 74% rename from lib/PuppeteerSharp/Messaging/WSEndpointResponse.cs rename to lib/PuppeteerSharp/Cdp/Messaging/WSEndpointResponse.cs index 5e1503ec3..dd526349a 100644 --- a/lib/PuppeteerSharp/Messaging/WSEndpointResponse.cs +++ b/lib/PuppeteerSharp/Cdp/Messaging/WSEndpointResponse.cs @@ -1,4 +1,4 @@ -namespace PuppeteerSharp.Messaging +namespace PuppeteerSharp.Cdp.Messaging { internal class WSEndpointResponse { diff --git a/lib/PuppeteerSharp/Cdp/NetworkEventManager.cs b/lib/PuppeteerSharp/Cdp/NetworkEventManager.cs index eca633387..53c99e387 100644 --- a/lib/PuppeteerSharp/Cdp/NetworkEventManager.cs +++ b/lib/PuppeteerSharp/Cdp/NetworkEventManager.cs @@ -1,7 +1,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp.Cdp { diff --git a/lib/PuppeteerSharp/Cdp/NetworkManager.cs b/lib/PuppeteerSharp/Cdp/NetworkManager.cs index db4d2b361..bddd6e45e 100644 --- a/lib/PuppeteerSharp/Cdp/NetworkManager.cs +++ b/lib/PuppeteerSharp/Cdp/NetworkManager.cs @@ -5,9 +5,9 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.Cdp { diff --git a/lib/PuppeteerSharp/Connection.cs b/lib/PuppeteerSharp/Connection.cs index ebb8bdd21..d61fc49e4 100644 --- a/lib/PuppeteerSharp/Connection.cs +++ b/lib/PuppeteerSharp/Connection.cs @@ -7,9 +7,10 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using PuppeteerSharp.Cdp; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; using PuppeteerSharp.QueryHandlers; using PuppeteerSharp.Transport; @@ -25,7 +26,7 @@ public sealed class Connection : IDisposable, ICDPConnection private readonly TaskQueue _callbackQueue = new(); private readonly ConcurrentDictionary _callbacks = new(); - private readonly AsyncDictionaryHelper _sessions = new("Session {0} not found"); + private readonly AsyncDictionaryHelper _sessions = new("Session {0} not found"); private readonly List _manuallyAttached = []; private int _lastId; @@ -222,7 +223,7 @@ internal void Close(string closeReason) MessageQueue.Dispose(); } - internal CDPSession GetSession(string sessionId) => _sessions.GetValueOrDefault(sessionId); + internal CdpCDPSession GetSession(string sessionId) => _sessions.GetValueOrDefault(sessionId); /// /// Releases all resource used by the object. @@ -243,7 +244,7 @@ private void Dispose(bool disposing) _callbackQueue.Dispose(); } - private Task GetSessionAsync(string sessionId) => _sessions.GetItemAsync(sessionId); + private Task GetSessionAsync(string sessionId) => _sessions.GetItemAsync(sessionId); private async void Transport_MessageReceived(object sender, MessageReceivedEventArgs e) { @@ -300,7 +301,7 @@ private void ProcessIncomingMessage(ConnectionResponse obj) if (method == "Target.attachedToTarget") { var sessionId = param.SessionId; - var session = new CDPSession(this, param.TargetInfo.Type, sessionId, obj.SessionId); + var session = new CdpCDPSession(this, param.TargetInfo.Type, sessionId, obj.SessionId); _sessions.AddItem(sessionId, session); SessionAttached?.Invoke(this, new SessionEventArgs(session)); diff --git a/lib/PuppeteerSharp/DeviceRequestPrompt.cs b/lib/PuppeteerSharp/DeviceRequestPrompt.cs index 705cb506a..a7ac60c6b 100644 --- a/lib/PuppeteerSharp/DeviceRequestPrompt.cs +++ b/lib/PuppeteerSharp/DeviceRequestPrompt.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp; diff --git a/lib/PuppeteerSharp/DeviceRequestPromptManager.cs b/lib/PuppeteerSharp/DeviceRequestPromptManager.cs index 859b496de..f710e7712 100644 --- a/lib/PuppeteerSharp/DeviceRequestPromptManager.cs +++ b/lib/PuppeteerSharp/DeviceRequestPromptManager.cs @@ -22,8 +22,8 @@ using System; using System.Threading.Tasks; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp; diff --git a/lib/PuppeteerSharp/ElementHandle.cs b/lib/PuppeteerSharp/ElementHandle.cs index 0641bf30f..55f34e804 100644 --- a/lib/PuppeteerSharp/ElementHandle.cs +++ b/lib/PuppeteerSharp/ElementHandle.cs @@ -6,9 +6,9 @@ using System.Linq; using System.Threading.Tasks; using Newtonsoft.Json.Linq; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Input; -using PuppeteerSharp.Messaging; using PuppeteerSharp.QueryHandlers; namespace PuppeteerSharp diff --git a/lib/PuppeteerSharp/EmulationManager.cs b/lib/PuppeteerSharp/EmulationManager.cs index 322710593..dde01778b 100644 --- a/lib/PuppeteerSharp/EmulationManager.cs +++ b/lib/PuppeteerSharp/EmulationManager.cs @@ -3,9 +3,9 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Media; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/ExecutionContext.cs b/lib/PuppeteerSharp/ExecutionContext.cs index dac86bd64..a51547bf5 100644 --- a/lib/PuppeteerSharp/ExecutionContext.cs +++ b/lib/PuppeteerSharp/ExecutionContext.cs @@ -6,8 +6,8 @@ using System.Threading.Tasks; using Newtonsoft.Json.Linq; using PuppeteerSharp.Cdp; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/FileChooser.cs b/lib/PuppeteerSharp/FileChooser.cs index 2e899e85e..52cac8a4e 100644 --- a/lib/PuppeteerSharp/FileChooser.cs +++ b/lib/PuppeteerSharp/FileChooser.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/Frame.cs b/lib/PuppeteerSharp/Frame.cs index 4b5e90030..31e057500 100644 --- a/lib/PuppeteerSharp/Frame.cs +++ b/lib/PuppeteerSharp/Frame.cs @@ -4,9 +4,9 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; using PuppeteerSharp.Cdp; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Input; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/FrameManager.cs b/lib/PuppeteerSharp/FrameManager.cs index d6b7f3ef8..cff423468 100644 --- a/lib/PuppeteerSharp/FrameManager.cs +++ b/lib/PuppeteerSharp/FrameManager.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using PuppeteerSharp.Cdp; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/Helpers/AsyncMessageQueue.cs b/lib/PuppeteerSharp/Helpers/AsyncMessageQueue.cs index f939dd122..7a3f35c94 100644 --- a/lib/PuppeteerSharp/Helpers/AsyncMessageQueue.cs +++ b/lib/PuppeteerSharp/Helpers/AsyncMessageQueue.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp.Helpers { diff --git a/lib/PuppeteerSharp/Helpers/ProtocolStreamReader.cs b/lib/PuppeteerSharp/Helpers/ProtocolStreamReader.cs index b1f616b75..2966cf746 100644 --- a/lib/PuppeteerSharp/Helpers/ProtocolStreamReader.cs +++ b/lib/PuppeteerSharp/Helpers/ProtocolStreamReader.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp.Helpers { diff --git a/lib/PuppeteerSharp/Helpers/RemoteObjectHelper.cs b/lib/PuppeteerSharp/Helpers/RemoteObjectHelper.cs index 53b51bca7..2bbd91060 100644 --- a/lib/PuppeteerSharp/Helpers/RemoteObjectHelper.cs +++ b/lib/PuppeteerSharp/Helpers/RemoteObjectHelper.cs @@ -3,8 +3,8 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.Helpers { diff --git a/lib/PuppeteerSharp/ICDPSession.cs b/lib/PuppeteerSharp/ICDPSession.cs index aece0fb87..80a4e2fd7 100644 --- a/lib/PuppeteerSharp/ICDPSession.cs +++ b/lib/PuppeteerSharp/ICDPSession.cs @@ -47,17 +47,6 @@ public interface ICDPSession : ICDPConnection /// event EventHandler SessionDetached; - /// - /// Connection close reason. - /// - string CloseReason { get; } - - /// - /// Gets a value indicating whether this is closed. - /// - /// true if is closed; otherwise, false. - bool IsClosed { get; } - /// /// Gets the logger factory. /// @@ -70,12 +59,6 @@ public interface ICDPSession : ICDPConnection /// The session identifier. string Id { get; } - /// - /// Gets the target type. - /// - /// The target type. - TargetType TargetType { get; } - /// /// Detaches session from target. Once detached, session won't emit any events and can't be used to send messages. /// diff --git a/lib/PuppeteerSharp/IJSHandle.cs b/lib/PuppeteerSharp/IJSHandle.cs index 849fd0c63..c11b5efad 100644 --- a/lib/PuppeteerSharp/IJSHandle.cs +++ b/lib/PuppeteerSharp/IJSHandle.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json.Linq; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/Input/Keyboard.cs b/lib/PuppeteerSharp/Input/Keyboard.cs index bddeb5b29..b72c566ee 100644 --- a/lib/PuppeteerSharp/Input/Keyboard.cs +++ b/lib/PuppeteerSharp/Input/Keyboard.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Globalization; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp.Input { diff --git a/lib/PuppeteerSharp/Input/Mouse.cs b/lib/PuppeteerSharp/Input/Mouse.cs index de544dabf..7d8810faa 100644 --- a/lib/PuppeteerSharp/Input/Mouse.cs +++ b/lib/PuppeteerSharp/Input/Mouse.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; -using PuppeteerSharp.Messaging; /* The implementation of transactions is not the same as in the original Puppeteer diff --git a/lib/PuppeteerSharp/Input/MouseState.cs b/lib/PuppeteerSharp/Input/MouseState.cs index 2dc6e8046..2553daf68 100644 --- a/lib/PuppeteerSharp/Input/MouseState.cs +++ b/lib/PuppeteerSharp/Input/MouseState.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.Input { diff --git a/lib/PuppeteerSharp/Input/Touchscreen.cs b/lib/PuppeteerSharp/Input/Touchscreen.cs index 100dcba88..e5fcde7f7 100755 --- a/lib/PuppeteerSharp/Input/Touchscreen.cs +++ b/lib/PuppeteerSharp/Input/Touchscreen.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp.Input { diff --git a/lib/PuppeteerSharp/IsolatedWorld.cs b/lib/PuppeteerSharp/IsolatedWorld.cs index 89773288d..8d4c40dc0 100644 --- a/lib/PuppeteerSharp/IsolatedWorld.cs +++ b/lib/PuppeteerSharp/IsolatedWorld.cs @@ -5,9 +5,9 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/JSHandle.cs b/lib/PuppeteerSharp/JSHandle.cs index 86ac7e05b..836344493 100644 --- a/lib/PuppeteerSharp/JSHandle.cs +++ b/lib/PuppeteerSharp/JSHandle.cs @@ -3,8 +3,8 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/Launcher.cs b/lib/PuppeteerSharp/Launcher.cs index ae2790abf..45aed52d5 100644 --- a/lib/PuppeteerSharp/Launcher.cs +++ b/lib/PuppeteerSharp/Launcher.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; using PuppeteerSharp.BrowserData; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/MessageException.cs b/lib/PuppeteerSharp/MessageException.cs index 031040b64..867093120 100644 --- a/lib/PuppeteerSharp/MessageException.cs +++ b/lib/PuppeteerSharp/MessageException.cs @@ -1,6 +1,6 @@ using System; using System.Runtime.Serialization; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/Messaging/AccessibilityQueryAXTreeResponse.cs b/lib/PuppeteerSharp/Messaging/AccessibilityQueryAXTreeResponse.cs deleted file mode 100644 index f1db1b7d5..000000000 --- a/lib/PuppeteerSharp/Messaging/AccessibilityQueryAXTreeResponse.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections.Generic; -using Newtonsoft.Json.Linq; -using PuppeteerSharp.PageAccessibility; -using static PuppeteerSharp.Messaging.AccessibilityGetFullAXTreeResponse; - -namespace PuppeteerSharp.Messaging -{ - internal class AccessibilityQueryAXTreeResponse - { - public IEnumerable Nodes { get; set; } - } -} diff --git a/lib/PuppeteerSharp/Page.cs b/lib/PuppeteerSharp/Page.cs index c549cb31a..2da175806 100644 --- a/lib/PuppeteerSharp/Page.cs +++ b/lib/PuppeteerSharp/Page.cs @@ -9,14 +9,15 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; using PuppeteerSharp.Cdp; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; using PuppeteerSharp.Input; using PuppeteerSharp.Media; -using PuppeteerSharp.Messaging; using PuppeteerSharp.Mobile; using PuppeteerSharp.PageAccessibility; using PuppeteerSharp.PageCoverage; +using StackTrace = PuppeteerSharp.Cdp.Messaging.StackTrace; using Timer = System.Timers.Timer; namespace PuppeteerSharp @@ -1684,7 +1685,7 @@ private void OnAttachedToTarget(object sender, SessionEventArgs e) session, session.Target.Url, session.Target.TargetId, - session.TargetType, + session.Target.TargetInfo.Type, AddConsoleMessageAsync, HandleException); _workers[session.Id] = worker; @@ -1780,7 +1781,7 @@ private Task OnConsoleAPIAsync(PageConsoleResponse message) return AddConsoleMessageAsync(message.Type, values, message.StackTrace); } - private async Task AddConsoleMessageAsync(ConsoleType type, IJSHandle[] values, Messaging.StackTrace stackTrace) + private async Task AddConsoleMessageAsync(ConsoleType type, IJSHandle[] values, StackTrace stackTrace) { if (Console?.GetInvocationList().Length == 0) { diff --git a/lib/PuppeteerSharp/PageAccessibility/AXNode.cs b/lib/PuppeteerSharp/PageAccessibility/AXNode.cs index 9d445dd6a..3f687e9db 100644 --- a/lib/PuppeteerSharp/PageAccessibility/AXNode.cs +++ b/lib/PuppeteerSharp/PageAccessibility/AXNode.cs @@ -3,8 +3,8 @@ using System.Globalization; using System.Linq; using Newtonsoft.Json.Linq; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.PageAccessibility { diff --git a/lib/PuppeteerSharp/PageAccessibility/Accessibility.cs b/lib/PuppeteerSharp/PageAccessibility/Accessibility.cs index 19407d9bf..c28a143a9 100644 --- a/lib/PuppeteerSharp/PageAccessibility/Accessibility.cs +++ b/lib/PuppeteerSharp/PageAccessibility/Accessibility.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp.PageAccessibility { diff --git a/lib/PuppeteerSharp/PageCoverage/CSSCoverage.cs b/lib/PuppeteerSharp/PageCoverage/CSSCoverage.cs index 15947d025..ef92ed1e1 100755 --- a/lib/PuppeteerSharp/PageCoverage/CSSCoverage.cs +++ b/lib/PuppeteerSharp/PageCoverage/CSSCoverage.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.PageCoverage { diff --git a/lib/PuppeteerSharp/PageCoverage/Coverage.cs b/lib/PuppeteerSharp/PageCoverage/Coverage.cs index 08daf8659..57d933c6a 100644 --- a/lib/PuppeteerSharp/PageCoverage/Coverage.cs +++ b/lib/PuppeteerSharp/PageCoverage/Coverage.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.PageCoverage { diff --git a/lib/PuppeteerSharp/PageCoverage/CoverageEntryPoint.cs b/lib/PuppeteerSharp/PageCoverage/CoverageEntryPoint.cs index 82ae29ca8..2403dcea1 100644 --- a/lib/PuppeteerSharp/PageCoverage/CoverageEntryPoint.cs +++ b/lib/PuppeteerSharp/PageCoverage/CoverageEntryPoint.cs @@ -1,5 +1,4 @@ using System; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.PageCoverage { diff --git a/lib/PuppeteerSharp/PageCoverage/JSCoverage.cs b/lib/PuppeteerSharp/PageCoverage/JSCoverage.cs index 8f8bff08a..83e2b018c 100755 --- a/lib/PuppeteerSharp/PageCoverage/JSCoverage.cs +++ b/lib/PuppeteerSharp/PageCoverage/JSCoverage.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers.Json; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp.PageCoverage { diff --git a/lib/PuppeteerSharp/QueryHandlers/AriaQueryHandler.cs b/lib/PuppeteerSharp/QueryHandlers/AriaQueryHandler.cs index f0eec54ae..8c083e759 100644 --- a/lib/PuppeteerSharp/QueryHandlers/AriaQueryHandler.cs +++ b/lib/PuppeteerSharp/QueryHandlers/AriaQueryHandler.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; -using static PuppeteerSharp.Messaging.AccessibilityGetFullAXTreeResponse; +using PuppeteerSharp.Cdp.Messaging; +using static PuppeteerSharp.Cdp.Messaging.AccessibilityGetFullAXTreeResponse; namespace PuppeteerSharp.QueryHandlers { diff --git a/lib/PuppeteerSharp/QueryHandlers/CssQueryHandler.cs b/lib/PuppeteerSharp/QueryHandlers/CssQueryHandler.cs index 2ada2b2af..b90a87810 100644 --- a/lib/PuppeteerSharp/QueryHandlers/CssQueryHandler.cs +++ b/lib/PuppeteerSharp/QueryHandlers/CssQueryHandler.cs @@ -3,8 +3,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; -using static PuppeteerSharp.Messaging.AccessibilityGetFullAXTreeResponse; +using static PuppeteerSharp.Cdp.Messaging.AccessibilityGetFullAXTreeResponse; namespace PuppeteerSharp.QueryHandlers { diff --git a/lib/PuppeteerSharp/QueryHandlers/PierceQueryHandler.cs b/lib/PuppeteerSharp/QueryHandlers/PierceQueryHandler.cs index 99bc8bc6c..81568b3ed 100644 --- a/lib/PuppeteerSharp/QueryHandlers/PierceQueryHandler.cs +++ b/lib/PuppeteerSharp/QueryHandlers/PierceQueryHandler.cs @@ -3,8 +3,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; -using static PuppeteerSharp.Messaging.AccessibilityGetFullAXTreeResponse; +using static PuppeteerSharp.Cdp.Messaging.AccessibilityGetFullAXTreeResponse; namespace PuppeteerSharp.QueryHandlers { diff --git a/lib/PuppeteerSharp/QueryHandlers/TextQueryHandler.cs b/lib/PuppeteerSharp/QueryHandlers/TextQueryHandler.cs index 01effbe6d..e4f09ffaf 100644 --- a/lib/PuppeteerSharp/QueryHandlers/TextQueryHandler.cs +++ b/lib/PuppeteerSharp/QueryHandlers/TextQueryHandler.cs @@ -3,8 +3,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; -using static PuppeteerSharp.Messaging.AccessibilityGetFullAXTreeResponse; +using static PuppeteerSharp.Cdp.Messaging.AccessibilityGetFullAXTreeResponse; namespace PuppeteerSharp.QueryHandlers { diff --git a/lib/PuppeteerSharp/QueryHandlers/XPathQueryHandler.cs b/lib/PuppeteerSharp/QueryHandlers/XPathQueryHandler.cs index 05de72d3c..2e33470ae 100644 --- a/lib/PuppeteerSharp/QueryHandlers/XPathQueryHandler.cs +++ b/lib/PuppeteerSharp/QueryHandlers/XPathQueryHandler.cs @@ -3,8 +3,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using PuppeteerSharp.Messaging; -using static PuppeteerSharp.Messaging.AccessibilityGetFullAXTreeResponse; +using static PuppeteerSharp.Cdp.Messaging.AccessibilityGetFullAXTreeResponse; namespace PuppeteerSharp.QueryHandlers { diff --git a/lib/PuppeteerSharp/QueuedEventGroup.cs b/lib/PuppeteerSharp/QueuedEventGroup.cs index a7a233f91..08343b712 100644 --- a/lib/PuppeteerSharp/QueuedEventGroup.cs +++ b/lib/PuppeteerSharp/QueuedEventGroup.cs @@ -1,4 +1,4 @@ -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/RedirectInfo.cs b/lib/PuppeteerSharp/RedirectInfo.cs index d6ea407af..c0d04996c 100644 --- a/lib/PuppeteerSharp/RedirectInfo.cs +++ b/lib/PuppeteerSharp/RedirectInfo.cs @@ -1,4 +1,4 @@ -using PuppeteerSharp.Messaging; +using PuppeteerSharp.Cdp.Messaging; namespace PuppeteerSharp { diff --git a/lib/PuppeteerSharp/Tracing.cs b/lib/PuppeteerSharp/Tracing.cs index a36beeca8..0307fe3eb 100644 --- a/lib/PuppeteerSharp/Tracing.cs +++ b/lib/PuppeteerSharp/Tracing.cs @@ -4,8 +4,8 @@ using System.Text; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using PuppeteerSharp.Cdp.Messaging; using PuppeteerSharp.Helpers; -using PuppeteerSharp.Messaging; namespace PuppeteerSharp {