Skip to content

Commit 384e9d6

Browse files
authored
Fix CDP Params could be null (#2935)
* Fix CDP Params could be null * update analyzer * analyzer fixes * Update lib/PuppeteerSharp/Cdp/CdpCDPSession.cs
1 parent d235049 commit 384e9d6

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

lib/PuppeteerSharp/Cdp/CdpCDPSession.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ internal void OnMessage(ConnectionResponse obj)
130130
{
131131
Connection.MessageQueue.Enqueue(callback, obj);
132132
}
133-
else if (obj.Method != null)
133+
else if (obj.Method is not null && obj.Params is not null)
134134
{
135135
// If the message was set to not wait for callback, the message won't be in the callbacks dictionary
136136
// And it might have no method set.

lib/PuppeteerSharp/ElementHandle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public Task<IElementHandle[]> QuerySelectorAllAsync(string selector)
241241

242242
var (updatedSelector, queryHandler) = CustomQuerySelectorRegistry.GetQueryHandlerAndSelector(selector);
243243
var result = new List<IElementHandle>();
244-
await foreach (var item in queryHandler.QueryAllAsync(handle, updatedSelector))
244+
await foreach (var item in queryHandler.QueryAllAsync(handle, updatedSelector).ConfigureAwait(false))
245245
{
246246
result.Add(item);
247247
}

lib/PuppeteerSharp/Frame.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public async Task<ElementHandle> FrameElementAsync()
309309
return document.querySelectorAll('iframe, frame');
310310
}").ConfigureAwait(false);
311311

312-
await foreach (var iframe in list.TransposeIterableHandleAsync())
312+
await foreach (var iframe in list.TransposeIterableHandleAsync().ConfigureAwait(false))
313313
{
314314
var frame = await iframe.ContentFrameAsync().ConfigureAwait(false);
315315
if (frame?.Id == Id)

lib/PuppeteerSharp/PuppeteerHandleExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ internal static RuntimeCallFunctionOnRequestArgumentValue FormatArgument(this IJ
123123
throw new PuppeteerException("JSHandle is disposed!");
124124
}
125125

126-
if ((jSHandle as JSHandle).Realm != context.World)
126+
if ((jSHandle as JSHandle)?.Realm != context.World)
127127
{
128128
throw new PuppeteerException("JSHandles can be evaluated only in the context they were created!");
129129
}
@@ -162,7 +162,7 @@ internal static async IAsyncEnumerable<IElementHandle> TransposeIterableHandleAs
162162
})();
163163
}").ConfigureAwait(false);
164164

165-
await foreach (var item in iterator.TransposeIteratorHandleAsync())
165+
await foreach (var item in iterator.TransposeIteratorHandleAsync().ConfigureAwait(false))
166166
{
167167
yield return item;
168168
}
@@ -211,7 +211,7 @@ internal static async Task<IEnumerable<IElementHandle>> FastTransposeIteratorHan
211211
var properties = await array.GetPropertiesAsync().ConfigureAwait(false);
212212

213213
await array.DisposeAsync().ConfigureAwait(false);
214-
return properties.Values.Where(handle => handle is IElementHandle).Cast<IElementHandle>();
214+
return properties.Values.Where(h => h is IElementHandle).Cast<IElementHandle>();
215215
}
216216
}
217217
}

lib/PuppeteerSharp/PuppeteerSharp.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<Description>Headless Browser .NET API</Description>
1313
<PackageId>PuppeteerSharp</PackageId>
1414
<PackageReleaseNotes></PackageReleaseNotes>
15-
<PackageVersion>20.2.0</PackageVersion>
16-
<ReleaseVersion>20.2.0</ReleaseVersion>
17-
<AssemblyVersion>20.2.0</AssemblyVersion>
18-
<FileVersion>20.2.0</FileVersion>
15+
<PackageVersion>20.2.1</PackageVersion>
16+
<ReleaseVersion>20.2.1</ReleaseVersion>
17+
<AssemblyVersion>20.2.1</AssemblyVersion>
18+
<FileVersion>20.2.1</FileVersion>
1919
<SynchReleaseVersion>false</SynchReleaseVersion>
2020
<StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
2121
<DebugType>embedded</DebugType>
@@ -29,7 +29,7 @@
2929
</PropertyGroup>
3030
<Import Project="../Common/CommonProps.props" />
3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
32+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3535
</PackageReference>

lib/PuppeteerSharp/QueryHandlers/QueryHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public string QuerySelectorAll
3131
return _querySelectorAll;
3232
}
3333

34-
set
34+
init
3535
{
3636
_querySelectorAll = value;
3737
}
@@ -65,7 +65,7 @@ internal string QuerySelector
6565
return _querySelector;
6666
}
6767

68-
set
68+
init
6969
{
7070
_querySelector = value;
7171
}
@@ -166,7 +166,7 @@ internal virtual async IAsyncEnumerable<IElementHandle> QueryAllAsync(IElementHa
166166
new LazyArg(async context => await context.GetPuppeteerUtilAsync().ConfigureAwait(false)))
167167
.ConfigureAwait(false);
168168

169-
await foreach (var item in handle.TransposeIterableHandleAsync())
169+
await foreach (var item in handle.TransposeIterableHandleAsync().ConfigureAwait(false))
170170
{
171171
yield return item;
172172
}

0 commit comments

Comments
 (0)