Skip to content

Bump Zyga.SeriRestClient from 0.1.1 to 0.2.0 #2

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
zyga69 merged 2 commits into from
Oct 27, 2026
Merged

Bump Zyga.SeriRestClient from 0.1.1 to 0.2.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f43149
Bump Zyga.SeriRestClient from 0.1.1 to 0.2.0
dependabot[bot] Oct 23, 2026
cee05a7
Update DI registration for Zyga.SeriRestClient 0.2.0's fluent builder…
zyga69 Oct 27, 2026
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
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.13" />
<PackageVersion Include="RestSharp" Version="114.1.0" />
<PackageVersion Include="Serilog" Version="4.4.0" />
<PackageVersion Include="Zyga.SeriRestClient" Version="0.1.1" />
<PackageVersion Include="Zyga.SeriRestClient" Version="0.2.0" />
</ItemGroup>

<!-- Console sample only. -->
Expand Down
42 changes: 25 additions & 17 deletions src/Zyga.HikIsapiClient/ExtensionMethods/RegistrationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ public static IHostBuilder AddHikIsapi(this IHostBuilder hostBuilder, string con
.GetRequiredSection(configSection)
.Get<IsapiConfig>() ?? throw new Exception($"Section [{configSection}] not found in config")
)
.AddSeriRestClient(Isapi.ServiceKey, (sp, key) =>
{
return sp.GetRequiredService<IIsapiConfig>()
.GetRestClientOptions();
})
.AddSeriRestClient(Isapi.ServiceKey)
.Configure((sp, _, options) => sp.GetRequiredService<IIsapiConfig>()
.ApplyRestClientOptions(options))
.Services
.AddTransient<IIsapi, Isapi>((sp) => new Isapi(
sp.GetRequiredService<IIsapiConfig>(),
sp.GetRequiredService<Serilog.ILogger>(),
Expand All @@ -53,13 +52,13 @@ public static IHostBuilder AddHikIsapi(this IHostBuilder hostBuilder, string con
public static IServiceCollection AddKeyedHikIsapi<TConfig>(this IServiceCollection services, object isapiKey, Func<IServiceProvider, object?, TConfig> implementationFactory)
where TConfig : class, IIsapiConfig
{
return services
services
.AddKeyedSingleton<IIsapiConfig, TConfig>(isapiKey, implementationFactory)
.AddSeriRestClient($"{Isapi.ServiceKey}_{isapiKey}", (sp, seriRestKey) =>
{
return sp.GetRequiredKeyedService<IIsapiConfig>(isapiKey)
.GetRestClientOptions();
})
.AddSeriRestClient($"{Isapi.ServiceKey}_{isapiKey}")
.Configure((sp, _, options) => sp.GetRequiredKeyedService<IIsapiConfig>(isapiKey)
.ApplyRestClientOptions(options));

return services
.AddKeyedScoped<IIsapi, Isapi>(isapiKey, (sp, _) => new Isapi(
sp.GetRequiredKeyedService<IIsapiConfig>(isapiKey),
sp.GetRequiredService<Serilog.ILogger>(),
Expand All @@ -74,11 +73,20 @@ public static IServiceCollection AddKeyedHikIsapi<TConfig>(this IServiceCollecti
/// <returns>Configured <see cref="RestClientOptions"/> pointing at the device's ISAPI endpoint.</returns>
public static RestClientOptions GetRestClientOptions(this IIsapiConfig config)
{
return new RestClientOptions()
{
CookieContainer = new CookieContainer(),
BaseUrl = new Uri($"{config.Address}/ISAPI"),
Timeout = TimeSpan.FromMilliseconds(config.MaxTimeout ?? 5000)
};
var options = new RestClientOptions();
config.ApplyRestClientOptions(options);
return options;
}

/// <summary>
/// Applies a device's configuration onto an existing <see cref="RestClientOptions"/> instance.
/// </summary>
/// <param name="config">The device configuration.</param>
/// <param name="options">The options instance to configure.</param>
private static void ApplyRestClientOptions(this IIsapiConfig config, RestClientOptions options)
{
options.CookieContainer = new CookieContainer();
options.BaseUrl = new Uri($"{config.Address}/ISAPI");
options.Timeout = TimeSpan.FromMilliseconds(config.MaxTimeout ?? 5000);
}
}
Loading