Skip to content

[dotnet] [bidi] Cache modules in the root BiDi #16655

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
Nov 30, 2025
+11 −22
Merged

[dotnet] [bidi] Cache modules in the root BiDi #16655

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11e50ff
[dotnet] [bidi] Cache modules in the root BiDi
nvborisenko Nov 30, 2025
e4fdf7b
Avoid GetJsonOptions() invocation
nvborisenko Nov 30, 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
33 changes: 11 additions & 22 deletions dotnet/src/webdriver/BiDi/BiDi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,27 @@ private BiDi(string url)
var uri = new Uri(url);

Broker = new Broker(this, uri);

SessionModule = AsModule<Session.SessionModule>();
BrowsingContext = AsModule<BrowsingContext.BrowsingContextModule>();
Browser = AsModule<Browser.BrowserModule>();
Network = AsModule<Network.NetworkModule>();
InputModule = AsModule<Input.InputModule>();
Script = AsModule<Script.ScriptModule>();
Log = AsModule<Log.LogModule>();
Storage = AsModule<Storage.StorageModule>();
WebExtension = AsModule<WebExtension.WebExtensionModule>();
Emulation = AsModule<Emulation.EmulationModule>();
}

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

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

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

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

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

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

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

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

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

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

public Task<Session.StatusResult> StatusAsync()
{
Expand Down Expand Up @@ -96,7 +85,7 @@ public async ValueTask DisposeAsync()

public T AsModule<T>() where T : Module, new()
{
return (T)_modules.GetOrAdd(typeof(T), Module.Create<T>(this, Broker, GetJsonOptions()));
return (T)_modules.GetOrAdd(typeof(T), _ => Module.Create<T>(this, Broker, GetJsonOptions()));
}

private Broker Broker { get; }
Expand Down
Loading