Skip to content

Commit b389aef

Browse files
nvborisenkotitusfortner
nvborisenko
authored and
titusfortner
committed
[dotnet] [bidi] Refactor BiDi module initialization to pass BiDi explicitly (#16983)
1 parent b5c491b commit b389aef

14 files changed

Lines changed: 52 additions & 55 deletions

File tree

‎dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ public async Task<SetDownloadBehaviorResult> SetDownloadBehaviorDeniedAsync(SetD
7979
return await ExecuteCommandAsync(new SetDownloadBehaviorCommand(@params), options, _jsonContext.SetDownloadBehaviorCommand, _jsonContext.SetDownloadBehaviorResult).ConfigureAwait(false);
8080
}
8181

82-
protected override void Initialize(JsonSerializerOptions jsonSerializerOptions)
82+
protected override void Initialize(BiDi bidi, JsonSerializerOptions jsonSerializerOptions)
8383
{
84-
jsonSerializerOptions.Converters.Add(new BrowserUserContextConverter(BiDi));
84+
jsonSerializerOptions.Converters.Add(new BrowserUserContextConverter(bidi));
8585

8686
_jsonContext = new BrowserJsonSerializerContext(jsonSerializerOptions);
8787
}

‎dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,12 @@ public async Task<Subscription> OnUserPromptClosedAsync(Action<UserPromptClosedE
253253
return await SubscribeAsync("browsingContext.userPromptClosed", handler, options, _jsonContext.UserPromptClosedEventArgs).ConfigureAwait(false);
254254
}
255255

256-
protected override void Initialize(JsonSerializerOptions jsonSerializerOptions)
256+
protected override void Initialize(BiDi bidi, JsonSerializerOptions jsonSerializerOptions)
257257
{
258-
jsonSerializerOptions.Converters.Add(new BrowsingContextConverter(BiDi));
259-
jsonSerializerOptions.Converters.Add(new InternalIdConverter(BiDi));
260-
jsonSerializerOptions.Converters.Add(new HandleConverter(BiDi));
261-
jsonSerializerOptions.Converters.Add(new BrowserUserContextConverter(BiDi));
258+
jsonSerializerOptions.Converters.Add(new BrowsingContextConverter(bidi));
259+
jsonSerializerOptions.Converters.Add(new InternalIdConverter(bidi));
260+
jsonSerializerOptions.Converters.Add(new HandleConverter(bidi));
261+
jsonSerializerOptions.Converters.Add(new BrowserUserContextConverter(bidi));
262262

263263
_jsonContext = new BrowsingContextJsonSerializerContext(jsonSerializerOptions);
264264
}

‎dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextNetworkModule.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public async Task<Interception> InterceptRequestAsync(Func<InterceptedRequest, T
3535

3636
var interceptResult = await networkModule.AddInterceptAsync([InterceptPhase.BeforeRequestSent], addInterceptOptions).ConfigureAwait(false);
3737

38-
Interception interception = new(context.BiDi, interceptResult.Intercept);
38+
Interception interception = new(networkModule, interceptResult.Intercept);
3939

4040
await interception.OnBeforeRequestSentAsync(
4141
async req => await handler(new(req.BiDi, req.Context, req.IsBlocked, req.Navigation, req.RedirectCount, req.Request, req.Timestamp, req.Initiator, req.Intercepts)),
@@ -53,7 +53,7 @@ public async Task<Interception> InterceptResponseAsync(Func<InterceptedResponse,
5353

5454
var interceptResult = await networkModule.AddInterceptAsync([InterceptPhase.ResponseStarted], addInterceptOptions).ConfigureAwait(false);
5555

56-
Interception interception = new(context.BiDi, interceptResult.Intercept);
56+
Interception interception = new(networkModule, interceptResult.Intercept);
5757

5858
await interception.OnResponseStartedAsync(
5959
async res => await handler(new(res.BiDi, res.Context, res.IsBlocked, res.Navigation, res.RedirectCount, res.Request, res.Timestamp, res.Response, res.Intercepts)),
@@ -71,7 +71,7 @@ public async Task<Interception> InterceptAuthAsync(Func<InterceptedAuth, Task> h
7171

7272
var interceptResult = await networkModule.AddInterceptAsync([InterceptPhase.AuthRequired], addInterceptOptions).ConfigureAwait(false);
7373

74-
Interception interception = new(context.BiDi, interceptResult.Intercept);
74+
Interception interception = new(networkModule, interceptResult.Intercept);
7575

7676
await interception.OnAuthRequiredAsync(
7777
async auth => await handler(new(auth.BiDi, auth.Context, auth.IsBlocked, auth.Navigation, auth.RedirectCount, auth.Request, auth.Timestamp, auth.Response, auth.Intercepts)),

‎dotnet/src/webdriver/BiDi/Emulation/EmulationModule.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ public async Task<SetGeolocationOverrideResult> SetGeolocationPositionErrorOverr
100100
return await ExecuteCommandAsync(new SetGeolocationOverrideCommand(@params), options, _jsonContext.SetGeolocationOverrideCommand, _jsonContext.SetGeolocationOverrideResult).ConfigureAwait(false);
101101
}
102102

103-
protected override void Initialize(JsonSerializerOptions jsonSerializerOptions)
103+
protected override void Initialize(BiDi bidi, JsonSerializerOptions jsonSerializerOptions)
104104
{
105-
jsonSerializerOptions.Converters.Add(new BrowsingContextConverter(BiDi));
106-
jsonSerializerOptions.Converters.Add(new BrowserUserContextConverter(BiDi));
105+
jsonSerializerOptions.Converters.Add(new BrowsingContextConverter(bidi));
106+
jsonSerializerOptions.Converters.Add(new BrowserUserContextConverter(bidi));
107107

108108
_jsonContext = new EmulationJsonSerializerContext(jsonSerializerOptions);
109109
}

‎dotnet/src/webdriver/BiDi/Input/InputModule.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ public async Task<Subscription> OnFileDialogOpenedAsync(Action<FileDialogInfo> h
6161
return await SubscribeAsync("input.fileDialogOpened", handler, options, _jsonContext.FileDialogInfo).ConfigureAwait(false);
6262
}
6363

64-
protected override void Initialize(JsonSerializerOptions jsonSerializerOptions)
64+
protected override void Initialize(BiDi bidi, JsonSerializerOptions jsonSerializerOptions)
6565
{
66-
jsonSerializerOptions.Converters.Add(new BrowsingContextConverter(BiDi));
67-
jsonSerializerOptions.Converters.Add(new HandleConverter(BiDi));
66+
jsonSerializerOptions.Converters.Add(new BrowsingContextConverter(bidi));
67+
jsonSerializerOptions.Converters.Add(new HandleConverter(bidi));
6868

6969
_jsonContext = new InputJsonSerializerContext(jsonSerializerOptions);
7070
}

‎dotnet/src/webdriver/BiDi/Log/LogModule.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ public async Task<Subscription> OnEntryAddedAsync(Action<LogEntry> handler, Subs
3939
return await SubscribeAsync("log.entryAdded", handler, options, _jsonContext.LogEntry).ConfigureAwait(false);
4040
}
4141

42-
protected override void Initialize(JsonSerializerOptions jsonSerializerOptions)
42+
protected override void Initialize(BiDi bidi, JsonSerializerOptions jsonSerializerOptions)
4343
{
44-
jsonSerializerOptions.Converters.Add(new BrowsingContextConverter(BiDi));
45-
jsonSerializerOptions.Converters.Add(new RealmConverter(BiDi));
46-
jsonSerializerOptions.Converters.Add(new InternalIdConverter(BiDi));
47-
jsonSerializerOptions.Converters.Add(new HandleConverter(BiDi));
44+
jsonSerializerOptions.Converters.Add(new BrowsingContextConverter(bidi));
45+
jsonSerializerOptions.Converters.Add(new RealmConverter(bidi));
46+
jsonSerializerOptions.Converters.Add(new InternalIdConverter(bidi));
47+
jsonSerializerOptions.Converters.Add(new HandleConverter(bidi));
4848

4949
_jsonContext = new LogJsonSerializerContext(jsonSerializerOptions);
5050
}

‎dotnet/src/webdriver/BiDi/Module.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ namespace OpenQA.Selenium.BiDi;
2626

2727
public abstract class Module
2828
{
29-
protected BiDi BiDi { get; private set; } = null!;
30-
3129
private Broker Broker { get; set; } = null!;
3230

3331
protected Task<TResult> ExecuteCommandAsync<TCommand, TResult>(TCommand command, CommandOptions? options, JsonTypeInfo<TCommand> jsonCommandTypeInfo, JsonTypeInfo<TResult> jsonResultTypeInfo)
@@ -51,18 +49,17 @@ public Task<Subscription> SubscribeAsync<TEventArgs>(string eventName, Func<TEve
5149
return Broker.SubscribeAsync(eventName, eventHandler, options, jsonTypeInfo);
5250
}
5351

54-
protected abstract void Initialize(JsonSerializerOptions jsonSerializerOptions);
52+
protected abstract void Initialize(BiDi bidi, JsonSerializerOptions jsonSerializerOptions);
5553

5654
internal static TModule Create<TModule>(BiDi bidi, Broker broker, JsonSerializerOptions jsonSerializerOptions)
5755
where TModule : Module, new()
5856
{
5957
TModule module = new()
6058
{
61-
BiDi = bidi,
6259
Broker = broker
6360
};
6461

65-
module.Initialize(jsonSerializerOptions);
62+
module.Initialize(bidi, jsonSerializerOptions);
6663

6764
return module;
6865
}

‎dotnet/src/webdriver/BiDi/Network/NetworkModule.HighLevel.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public async Task<Interception> InterceptRequestAsync(Func<InterceptedRequest, T
3030
{
3131
var interceptResult = await AddInterceptAsync([InterceptPhase.BeforeRequestSent], options).ConfigureAwait(false);
3232

33-
Interception interception = new(BiDi, interceptResult.Intercept);
33+
Interception interception = new(this, interceptResult.Intercept);
3434

3535
await interception.OnBeforeRequestSentAsync(async req => await handler(new(req.BiDi, req.Context, req.IsBlocked, req.Navigation, req.RedirectCount, req.Request, req.Timestamp, req.Initiator, req.Intercepts))).ConfigureAwait(false);
3636

@@ -41,7 +41,7 @@ public async Task<Interception> InterceptResponseAsync(Func<InterceptedResponse,
4141
{
4242
var interceptResult = await AddInterceptAsync([InterceptPhase.ResponseStarted], options).ConfigureAwait(false);
4343

44-
Interception interception = new(BiDi, interceptResult.Intercept);
44+
Interception interception = new(this, interceptResult.Intercept);
4545

4646
await interception.OnResponseStartedAsync(async res => await handler(new(res.BiDi, res.Context, res.IsBlocked, res.Navigation, res.RedirectCount, res.Request, res.Timestamp, res.Response, res.Intercepts))).ConfigureAwait(false);
4747

@@ -52,7 +52,7 @@ public async Task<Interception> InterceptAuthAsync(Func<InterceptedAuth, Task> h
5252
{
5353
var interceptResult = await AddInterceptAsync([InterceptPhase.AuthRequired], options).ConfigureAwait(false);
5454

55-
Interception interception = new(BiDi, interceptResult.Intercept);
55+
Interception interception = new(this, interceptResult.Intercept);
5656

5757
await interception.OnAuthRequiredAsync(async auth => await handler(new(auth.BiDi, auth.Context, auth.IsBlocked, auth.Navigation, auth.RedirectCount, auth.Request, auth.Timestamp, auth.Response, auth.Intercepts))).ConfigureAwait(false);
5858

@@ -128,15 +128,15 @@ public Task ContinueAsync(ContinueWithAuthCancelCredentialsOptions? options = nu
128128
}
129129
}
130130

131-
public sealed record Interception(BiDi BiDi, Intercept Intercept) : IAsyncDisposable
131+
public sealed record Interception(NetworkModule Network, Intercept Intercept) : IAsyncDisposable
132132
{
133133
IList<Subscription> OnBeforeRequestSentSubscriptions { get; } = [];
134134
IList<Subscription> OnResponseStartedSubscriptions { get; } = [];
135135
IList<Subscription> OnAuthRequiredSubscriptions { get; } = [];
136136

137137
public async Task RemoveAsync()
138138
{
139-
await BiDi.Network.RemoveInterceptAsync(Intercept).ConfigureAwait(false);
139+
await Network.RemoveInterceptAsync(Intercept).ConfigureAwait(false);
140140

141141
foreach (var subscription in OnBeforeRequestSentSubscriptions)
142142
{
@@ -156,21 +156,21 @@ public async Task RemoveAsync()
156156

157157
public async Task OnBeforeRequestSentAsync(Func<BeforeRequestSentEventArgs, Task> handler, SubscriptionOptions? options = null)
158158
{
159-
var subscription = await BiDi.Network.OnBeforeRequestSentAsync(async args => await Filter(args, handler), options).ConfigureAwait(false);
159+
var subscription = await Network.OnBeforeRequestSentAsync(async args => await Filter(args, handler), options).ConfigureAwait(false);
160160

161161
OnBeforeRequestSentSubscriptions.Add(subscription);
162162
}
163163

164164
public async Task OnResponseStartedAsync(Func<ResponseStartedEventArgs, Task> handler, SubscriptionOptions? options = null)
165165
{
166-
var subscription = await BiDi.Network.OnResponseStartedAsync(async args => await Filter(args, handler), options).ConfigureAwait(false);
166+
var subscription = await Network.OnResponseStartedAsync(async args => await Filter(args, handler), options).ConfigureAwait(false);
167167

168168
OnResponseStartedSubscriptions.Add(subscription);
169169
}
170170

171171
public async Task OnAuthRequiredAsync(Func<AuthRequiredEventArgs, Task> handler, SubscriptionOptions? options = null)
172172
{
173-
var subscription = await BiDi.Network.OnAuthRequiredAsync(async args => await Filter(args, handler), options).ConfigureAwait(false);
173+
var subscription = await Network.OnAuthRequiredAsync(async args => await Filter(args, handler), options).ConfigureAwait(false);
174174

175175
OnAuthRequiredSubscriptions.Add(subscription);
176176
}

‎dotnet/src/webdriver/BiDi/Network/NetworkModule.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ public async Task<Subscription> OnAuthRequiredAsync(Action<AuthRequiredEventArgs
174174
return await SubscribeAsync("network.authRequired", handler, options, _jsonContext.AuthRequiredEventArgs).ConfigureAwait(false);
175175
}
176176

177-
protected override void Initialize(JsonSerializerOptions jsonSerializerOptions)
177+
protected override void Initialize(BiDi bidi, JsonSerializerOptions jsonSerializerOptions)
178178
{
179-
jsonSerializerOptions.Converters.Add(new BrowsingContextConverter(BiDi));
180-
jsonSerializerOptions.Converters.Add(new CollectorConverter(BiDi));
181-
jsonSerializerOptions.Converters.Add(new InterceptConverter(BiDi));
182-
jsonSerializerOptions.Converters.Add(new BrowserUserContextConverter(BiDi));
179+
jsonSerializerOptions.Converters.Add(new BrowsingContextConverter(bidi));
180+
jsonSerializerOptions.Converters.Add(new CollectorConverter(bidi));
181+
jsonSerializerOptions.Converters.Add(new InterceptConverter(bidi));
182+
jsonSerializerOptions.Converters.Add(new BrowserUserContextConverter(bidi));
183183

184184
_jsonContext = new NetworkJsonSerializerContext(jsonSerializerOptions);
185185
}

‎dotnet/src/webdriver/BiDi/Permissions/PermissionsModule.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public async Task<SetPermissionResult> SetPermissionAsync(PermissionDescriptor d
3535
return await ExecuteCommandAsync(new SetPermissionCommand(@params), options, _jsonContext.SetPermissionCommand, _jsonContext.SetPermissionResult).ConfigureAwait(false);
3636
}
3737

38-
protected override void Initialize(JsonSerializerOptions jsonSerializerOptions)
38+
protected override void Initialize(BiDi bidi, JsonSerializerOptions jsonSerializerOptions)
3939
{
40-
jsonSerializerOptions.Converters.Add(new BrowserUserContextConverter(BiDi));
40+
jsonSerializerOptions.Converters.Add(new BrowserUserContextConverter(bidi));
4141

4242
_jsonContext = new PermissionsJsonSerializerContext(jsonSerializerOptions);
4343
}

0 commit comments

Comments
 (0)