Merge pull request #8 from betalgo/dev

version 0.0.0.5
betalgo · Dec 15, 2021 · 6109f9e · 6109f9e
2 parents ae4be31 + a90f63a
commit 6109f9e
Show file tree

Hide file tree

Showing 15 changed files with 100 additions and 53 deletions.
diff --git a/LaserCatEyes.DataServiceSdk.DotNetStandard/LaserCatEyes.DataServiceSdk.DotNetStandard.csproj b/LaserCatEyes.DataServiceSdk.DotNetStandard/LaserCatEyes.DataServiceSdk.DotNetStandard.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>0.0.4</Version>
+ <Version>0.0.5</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>

diff --git a/LaserCatEyes.DataServiceSdk/LaserCatEyes.DataServiceSdk.csproj b/LaserCatEyes.DataServiceSdk/LaserCatEyes.DataServiceSdk.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>0.0.4</Version>
+ <Version>0.0.5</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>

diff --git a/LaserCatEyes.Domain/LaserCatEyes.Domain.csproj b/LaserCatEyes.Domain/LaserCatEyes.Domain.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>0.0.4</Version>
+ <Version>0.0.5</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>

diff --git a/LaserCatEyes.Domain/Models/LaserCatEyesOptions.cs b/LaserCatEyes.Domain/Models/LaserCatEyesOptions.cs
@@ -4,6 +4,8 @@ namespace LaserCatEyes.Domain.Models
 {
  public class LaserCatEyesOptions
  {
+ public static string SettingKey = "LaserCatEyesOptions";
+
  public LaserCatEyesOptions(string appKey)
  {
  AppKey = appKey;

diff --git a/LaserCatEyes.EndpointListener/HttpListenerMiddleware.cs b/LaserCatEyes.EndpointListener/HttpListenerMiddleware.cs
@@ -47,7 +47,7 @@ public async Task InvokeAsync(HttpContext context, RequestDelegate next)
  replacementResponseBody.Position = 0;
  await replacementResponseBody.CopyToAsync(originalResponseBody);
  context.Response.Body = originalResponseBody;
- _laserCatEyesDataService.Report(PackageData.CreateResponsePackage(
+  _laserCatEyesDataService.Report(PackageData.CreateResponsePackage(
  operationId,
  context.Response.StatusCode,
  context.Response.Headers.SelectMany(r => r.Value.Select(value => $"{r.Key}:{value}")).ToList(),

diff --git a/LaserCatEyes.EndpointListener/LaserCatEyes.EndpointListener.csproj b/LaserCatEyes.EndpointListener/LaserCatEyes.EndpointListener.csproj
@@ -1,41 +1,44 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
- <Copyright>Betalgo Up Ltd.</Copyright>
- <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
- <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
- <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>0.0.4</Version>
- <Authors>Betalgo Up Ltd.</Authors>
- <Company>Betalgo Up Ltd.</Company>
- <Product>Laser Cat Eyes</Product>
- <Description>
- lasercateyes.com
- Laser Cat Eyes is an online debugging tool that can capture, inspect, monitor all HTTP/HTTPS traffic from your application. It contains a network function like diagnose network issues, etc.
+ <PropertyGroup>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
+ <Copyright>Betalgo Up Ltd.</Copyright>
+ <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
+ <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
+ <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+ <Version>0.0.5</Version>
+ <Authors>Betalgo Up Ltd.</Authors>
+ <Company>Betalgo Up Ltd.</Company>
+ <Product>Laser Cat Eyes</Product>
+ <Description>
+ lasercateyes.com
+ Laser Cat Eyes is an online debugging tool that can capture, inspect, monitor all HTTP/HTTPS traffic from your application. It contains a network function like diagnose network issues, etc.
 
- With Laser Cat Eyes all team members can remotely display in realtime all traffic smoothly that other members capture in their device. It allows team members to test and debug scripts right along with each other in realtime remotely. Laser Cat Eyes is a comprehensive helper to save time, to improve productivity with its easy to use layout, also it helps to play a lot with request and response.
+ With Laser Cat Eyes all team members can remotely display in realtime all traffic smoothly that other members capture in their device. It allows team members to test and debug scripts right along with each other in realtime remotely. Laser Cat Eyes is a comprehensive helper to save time, to improve productivity with its easy to use layout, also it helps to play a lot with request and response.
 
- All internal traffics that we are sending and receiving between the web browser/client and the server is invisible, and this brings difficulty, stress. Determining where is the fault exactly is a time-consuming process, a small error can sometimes take hours to debug with different browsers, operating systems, and devices, bugs are inevitable. Laser Cat Eyes offers extensive features that make it easy to see what is happening, so you debug your application effectively, quickly diagnose, and fix problems.
- </Description>
- <RepositoryUrl>https://github.com/betalgo/LCE-DotNet-SDK</RepositoryUrl>
- <PackageTags>network, debugging</PackageTags>
- </PropertyGroup>
+ All internal traffics that we are sending and receiving between the web browser/client and the server is invisible, and this brings difficulty, stress. Determining where is the fault exactly is a time-consuming process, a small error can sometimes take hours to debug with different browsers, operating systems, and devices, bugs are inevitable. Laser Cat Eyes offers extensive features that make it easy to see what is happening, so you debug your application effectively, quickly diagnose, and fix problems.
+ </Description>
+ <RepositoryUrl>https://github.com/betalgo/LCE-DotNet-SDK</RepositoryUrl>
+ <PackageTags>network, debugging</PackageTags>
+ </PropertyGroup>
 
- <ItemGroup>
- <None Include="LaserCatEyes_Logo.png">
- <Pack>True</Pack>
- <PackagePath></PackagePath>
- </None>
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
- <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
- </ItemGroup>
+ <ItemGroup>
+ <None Include="LaserCatEyes_Logo.png">
+ <Pack>True</Pack>
+ <PackagePath></PackagePath>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+ <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+ </ItemGroup>
 
- <ItemGroup>
- <ProjectReference Include="..\LaserCatEyes.DataServiceSdk\LaserCatEyes.DataServiceSdk.csproj" />
- </ItemGroup>
-</Project>
+ <ItemGroup>
+ <ProjectReference Include="..\LaserCatEyes.DataServiceSdk\LaserCatEyes.DataServiceSdk.csproj" />
+ </ItemGroup>
+</Project>
diff --git a/LaserCatEyes.EndpointListener/LaserCatEyesServiceCollectionExtensions.cs b/LaserCatEyes.EndpointListener/LaserCatEyesServiceCollectionExtensions.cs
@@ -3,6 +3,7 @@
 using LaserCatEyes.Domain;
 using LaserCatEyes.Domain.Models;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
@@ -14,14 +15,24 @@ public static class LaserCatEyesServiceCollectionExtensions
  public static IServiceCollection AddLaserCatEyesEndpointListener(this IServiceCollection services, Action<LaserCatEyesOptions> setupAction)
  {
  services.TryAddSingleton<IConfigureOptions<LaserCatEyesOptions>>(new ConfigureNamedOptions<LaserCatEyesOptions>(setupAction.Method.Name, setupAction));
- services.TryAddSingleton<ILaserCatEyesDataService, LaserCatEyesDataService>();
- services.AddTransient<EndpointListenerMiddleware>();
- return services;
+ return AddLaserCatEyesEndpointListenerBase(services);
+ }
+
+ public static IServiceCollection AddLaserCatEyesEndpointListener(this IServiceCollection services)
+ {
+ var configuration = services.BuildServiceProvider().GetRequiredService<IConfiguration>();
+ services.Configure<LaserCatEyesOptions>(configuration.GetSection(LaserCatEyesOptions.SettingKey));
+ return AddLaserCatEyesEndpointListenerBase(services);
  }
 
  public static IServiceCollection AddLaserCatEyesEndpointListener(this IServiceCollection services, string appKey)
  {
  services.TryAddSingleton(Options.Create(new LaserCatEyesOptions(appKey)));
+ return AddLaserCatEyesEndpointListenerBase(services);
+ }
+
+ private static IServiceCollection AddLaserCatEyesEndpointListenerBase(IServiceCollection services)
+ {
  services.TryAddSingleton<ILaserCatEyesDataService, LaserCatEyesDataService>();
  services.AddTransient<EndpointListenerMiddleware>();
  return services;

diff --git a/...s.HttpClientListener.DotNetStandard/LaserCatEyes.HttpClientListener.DotNetStandard.csproj b/...s.HttpClientListener.DotNetStandard/LaserCatEyes.HttpClientListener.DotNetStandard.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>0.0.4</Version>
+ <Version>0.0.5</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>

diff --git a/LaserCatEyes.HttpClientListener/LaserCatEyes.HttpClientListener.csproj b/LaserCatEyes.HttpClientListener/LaserCatEyes.HttpClientListener.csproj
@@ -6,7 +6,7 @@
  <PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
  <PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>0.0.4</Version>
+ <Version>0.0.5</Version>
  <Authors>Betalgo Up Ltd.</Authors>
  <Company>Betalgo Up Ltd.</Company>
  <Product>Laser Cat Eyes</Product>
@@ -22,8 +22,19 @@
  <PackageTags>network, debugging</PackageTags>
  </PropertyGroup>
 
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <LangVersion>9</LangVersion>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <LangVersion>9</LangVersion>
+ </PropertyGroup>
+
  <ItemGroup>
+ <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
  <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/LaserCatEyes.HttpClientListener/LaserCatEyesHttpMessageHandler.cs b/LaserCatEyes.HttpClientListener/LaserCatEyesHttpMessageHandler.cs
@@ -26,7 +26,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
  _laserCatEyesDataService.Report(PackageDataHelper.RequestPackageDataFromHttpRequestMessage(operationId, request));
 
  var response = await base.SendAsync(request, cancellationToken);
- 
+
  _laserCatEyesDataService.Report(PackageDataHelper.ResponsePackageDataFromHttpResponseMessage(operationId, response));
  return response;
  }

diff --git a/LaserCatEyes.HttpClientListener/LaserCatEyesServiceCollectionExtensions.cs b/LaserCatEyes.HttpClientListener/LaserCatEyesServiceCollectionExtensions.cs
@@ -2,6 +2,7 @@
 using LaserCatEyes.DataServiceSdk;
 using LaserCatEyes.Domain;
 using LaserCatEyes.Domain.Models;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Http;
@@ -11,6 +12,19 @@ namespace LaserCatEyes.HttpClientListener
 {
  public static class HttpClientListenerServiceCollectionExtensions
  {
+ public static IServiceCollection AddLaserCatEyesHttpClientListener(this IServiceCollection services, LaserCatEyesOptions options, bool listenAllHttpClients = true)
+ {
+ services.TryAddSingleton(options);
+ return AddLaserCatEyesHttpClientListenerBase(services, listenAllHttpClients);
+ }
+
+ public static IServiceCollection AddLaserCatEyesHttpClientListener(this IServiceCollection services, bool listenAllHttpClients = true)
+ {
+ var configuration = services.BuildServiceProvider().GetRequiredService<IConfiguration>();
+ services.Configure<LaserCatEyesOptions>(configuration.GetSection(LaserCatEyesOptions.SettingKey));
+ return AddLaserCatEyesHttpClientListenerBase(services, listenAllHttpClients);
+ }
+
  public static IServiceCollection AddLaserCatEyesHttpClientListener(this IServiceCollection services, string appKey, bool listenAllHttpClients = true)
  {
  services.TryAddSingleton(Options.Create(new LaserCatEyesOptions(appKey)));
@@ -34,6 +48,7 @@ private static IServiceCollection AddLaserCatEyesHttpClientListenerBase(IService
  options.HttpMessageHandlerBuilderActions.Add(builder => { builder.AdditionalHandlers.Add(builder.Services.GetRequiredService<LaserCatEyesHttpMessageHandler>()); });
  });
  }
+
  return services;
  }
  }

diff --git a/Sample/SampleDotNetCoreClientApp/Program.cs b/Sample/SampleDotNetCoreClientApp/Program.cs
@@ -5,9 +5,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Bogus;
-using LaserCatEyes.DataServiceSdk;
-using LaserCatEyes.Domain.Models;
 using LaserCatEyes.HttpClientListener;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace SampleDotNetCoreClientApp
@@ -17,11 +16,16 @@ internal class Program
  private static async Task Main(string[] args)
  {
  const string baseDomain = "https://localhost:44328";
-
 
  var serviceCollection = new ServiceCollection().AddLogging();
+
+ var builder = new ConfigurationBuilder()
+ .AddUserSecrets<Program>();
+ IConfiguration configuration = builder.Build();
+ serviceCollection.AddScoped(_ => configuration);
+
  serviceCollection.AddHttpClient<ISimpleClass, SimpleClass>();
- serviceCollection.AddLaserCatEyesHttpClientListener("cd579d47-eafb-44df-bfc7-ad1f4dd013d5");
+ serviceCollection.AddLaserCatEyesHttpClientListener();
 
  var serviceProvider = serviceCollection.BuildServiceProvider();
  var simpleClass = serviceProvider.GetRequiredService<ISimpleClass>();

diff --git a/Sample/SampleDotNetCoreClientApp/SampleDotNetCoreClientApp.csproj b/Sample/SampleDotNetCoreClientApp/SampleDotNetCoreClientApp.csproj
@@ -3,10 +3,12 @@
  <PropertyGroup>
  <OutputType>Exe</OutputType>
  <TargetFramework>netcoreapp3.1</TargetFramework>
+ <UserSecretsId>550e8434-d2dc-4997-8cda-fe3c4e5a5e86</UserSecretsId>
  </PropertyGroup>
 
  <ItemGroup>
  <PackageReference Include="Bogus" Version="34.0.1" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.13" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/Sample/SampleNetServerApp/SampleNetServerApp.csproj b/Sample/SampleNetServerApp/SampleNetServerApp.csproj
@@ -2,11 +2,10 @@
 
  <PropertyGroup>
  <TargetFramework>net6.0</TargetFramework>
+ <UserSecretsId>996389f1-bb0b-4803-b991-ea410c2bb2b0</UserSecretsId>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" NoWarn="NU1605" />
- <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" NoWarn="NU1605" />
  <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
  </ItemGroup>
 

diff --git a/Sample/SampleNetServerApp/Startup.cs b/Sample/SampleNetServerApp/Startup.cs
@@ -26,8 +26,8 @@ public void ConfigureServices(IServiceCollection services)
  {
  if (_env.IsDevelopment())
  {
- services.AddLaserCatEyesEndpointListener("cd579d47-eafb-44df-bfc7-ad1f4dd013d5");
- services.AddLaserCatEyesHttpClientListener("cd579d47-eafb-44df-bfc7-ad1f4dd013d5");
+ services.AddLaserCatEyesEndpointListener();
+ services.AddLaserCatEyesHttpClientListener();
  }
 
  services.AddControllers();