Skip to content

[dotnet] Replace lazy caching mechanism in BiDi's constructor with simple initialization #16399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 9, 2025
+20 −18
Merged

[dotnet] Replace lazy caching mechanism in BiDi's constructor with simple initialization #16399

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae87fe6
[dotnet] Replace lazy caching mechanism in BiDi's constructor with si…
RenderMichael Oct 8, 2025
7865500
Revert unnecessary changes
RenderMichael Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions dotnet/src/webdriver/BiDi/BiDi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
// </copyright>

using System;
using System.Collections.Concurrent;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading;
Expand All @@ -35,8 +34,6 @@ public sealed class BiDi : IAsyncDisposable
private readonly JsonSerializerOptions _jsonOptions;
private readonly BiDiJsonSerializerContext _jsonContext;

private readonly ConcurrentDictionary<Type, Module> _modules = [];

private BiDi(string url)
{
var uri = new Uri(url);
Expand Down Expand Up @@ -68,32 +65,37 @@ private BiDi(string url)
_jsonContext = new BiDiJsonSerializerContext(_jsonOptions);

_broker = new Broker(this, uri, _jsonOptions);
SessionModule = Module.Create<Session.SessionModule>(this, _broker, _jsonOptions, _jsonContext);
BrowsingContext = Module.Create<BrowsingContext.BrowsingContextModule>(this, _broker, _jsonOptions, _jsonContext);
Browser = Module.Create<Browser.BrowserModule>(this, _broker, _jsonOptions, _jsonContext);
Network = Module.Create<Network.NetworkModule>(this, _broker, _jsonOptions, _jsonContext);
InputModule = Module.Create<Input.InputModule>(this, _broker, _jsonOptions, _jsonContext);
Script = Module.Create<Script.ScriptModule>(this, _broker, _jsonOptions, _jsonContext);
Log = Module.Create<Log.LogModule>(this, _broker, _jsonOptions, _jsonContext);
Storage = Module.Create<Storage.StorageModule>(this, _broker, _jsonOptions, _jsonContext);
WebExtension = Module.Create<WebExtension.WebExtensionModule>(this, _broker, _jsonOptions, _jsonContext);
Emulation = Module.Create<Emulation.EmulationModule>(this, _broker, _jsonOptions, _jsonContext);
}

internal Session.SessionModule SessionModule => AsModule<Session.SessionModule>();

public BrowsingContext.BrowsingContextModule BrowsingContext => AsModule<BrowsingContext.BrowsingContextModule>();
internal Session.SessionModule SessionModule { get; }

public Browser.BrowserModule Browser => AsModule<Browser.BrowserModule>();
public BrowsingContext.BrowsingContextModule BrowsingContext { get; }

public Network.NetworkModule Network => AsModule<Network.NetworkModule>();
public Browser.BrowserModule Browser { get; }

internal Input.InputModule InputModule => AsModule<Input.InputModule>();
public Network.NetworkModule Network { get; }

public Script.ScriptModule Script => AsModule<Script.ScriptModule>();
internal Input.InputModule InputModule { get; }

public Log.LogModule Log => AsModule<Log.LogModule>();
public Script.ScriptModule Script { get; }

public Storage.StorageModule Storage => AsModule<Storage.StorageModule>();
public Log.LogModule Log { get; }

public WebExtension.WebExtensionModule WebExtension => AsModule<WebExtension.WebExtensionModule>();
public Storage.StorageModule Storage { get; }

public Emulation.EmulationModule Emulation => AsModule<Emulation.EmulationModule>();
public WebExtension.WebExtensionModule WebExtension { get; }

public TModule AsModule<TModule>() where TModule : Module, new()
{
return (TModule)_modules.GetOrAdd(typeof(TModule), _ => Module.Create<TModule>(this, _broker, _jsonOptions, _jsonContext));
}
public Emulation.EmulationModule Emulation { get; }

public Task<Session.StatusResult> StatusAsync()
{
Expand Down